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.

Shortly after last November’s election, Trump threatened China, Mexico, and Canada with 10% and 25% tariffs, respectively.

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.