US, China close to trade war deal