Colombia has walked back from the brink of a damaging trade war with the United States, reaching an agreement on accepting deported migrants being returned on military planes, after a flurry of threats from President Donald Trump that included steep tariffs.

The nations spent much of the day in a tense standoff, with the U.S. president threatening tariffs and visa restrictions after Colombia turned away two deportation flights.

Colombia will reject deportation flights from the United States after Brazil decried the treatment of migrants arriving handcuffed and shackled, complicating President Donald Trump’s plans and providing a contrast with the cooperative acceptance of Mexico and Guatemala.