U.S. President Donald Trump and Colombian President Gustavo Petro ended their public tit for tat that began when military planes with migrants were blocked, a disagreement that veered into tariff threats on both sides.

The White House said Sunday night that a U.S.-Colombia agreement had come together in the wake of a back-and-forth between the two countries over topics including immigration and tariffs.