'No China trade war' but umpire may be brought in over barley