The move had been discussed and rumored long before the AA-US merger was even a thought. I don't think they'll move back to the other side if the merger fails.
I could envision the ticket counter moving to T3 if the merger fails and US stays in *A. Since AC and UA are over there.