I could see Disney and Universal doing a trade of IP, or other wanted assets, so that Disney could get the rights to build certain Marvel attractions in Orlando. For instance, Iron Man. Uni has the rights to do an Iron Man attraction in Orlando, but I think this means Iron Man from the comics, but not, perhaps, necessarily using the Iron Man Marvel created for the films, IMHO. Obviously, Universal couldn't use Robert Downey Jr.'s likeness for such an attraction. Therefore, such a generic Iron Man attraction probably wouldn't be built, so Uni has a bargaining chip.
I'm just guessing, but I bet some sort of deal could be worked out. Universal and Disney aren't necessarily locked in a zero sum game as folks drawn to one park in Orlando, may well find time to visit the competitor.