“Both” is not the correct answer. It’s the Cubs, at least for now, according to USA Today’s Bob Nightengale. 

Nightengale reported the teams discussed a swap of the high-salary, low-production players before the July non-waiver deadline. Atlanta would have pay a lot of Upton’s money to make up for the $24 million difference in contracts.

The teams are expected to re-engage in the offseason, Nightengale reports.