In Florida, there's détente in the battle between Disney and Gov. Ron DeSantis