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

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.

U.S. President Donald Trump and Colombian President Gustavo Petro ended their public tit for tat that began when military planes with migrants were blocked, a disagreement that veered into tariff threats on both sides.