Deportation flights between the U.S. and Colombia have resumed following a dispute between the two countries that nearly led to a trade war.

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.

Colombian President Gustavo Petro announced that Colombia was suspending permission for previously authorized U.S. deportation flights to land in Colombia. Ostensibly driving Petro’s action were concerns that Colombian nationals were not being treated with respect during the deportation process because they were being transported by military aircraft.