For now, the tariff war between the US and Colombia has been averted, with both nations seeking to move past the standoff