The plans prior to the merger announcement had both CO and US moving to the current space to AA occupies. AA was to move into T-2, the old International Terminal that is currently under renovation with the LCC.

Now things have changed. T-2 will house Jet Blue and Virgin America. Southwest is remaining at their current location T-1.

I am going to assume that the merger will be complete prior to the re-opening of T-2.