A trade war started and apparently averted with Columbia overnight