The change of tack from the Competition and Markets Authority paves the way for the mega-merger to go ahead