Deportation flights from the US to Colombia resume following showdown that almost led to a trade war