Disney and Ron DeSantis made up — and it only cost $17 billion