trade war averted