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 welcomes ‘free and dignified’ deportees, stressing that migrants are not criminals.