The deal announced this week resolved the last remaining major obstacle standing in the way of the merger. But it didn’t put an end to the drama in the entertainment industry.