Parliament returns amid trade war