Are the US and China about to end their trade war?