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.

When Colombia’s president, Gustavo Petro, refused military planes carrying deportees, infuriating President Trump, he revealed how heated the question of deportations has become.

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.