Is the deportation dispute between Colombia and the US really over?

Furious row defused after US President Donald Trump's threat of sanctions over migration.