Everyone has moved past the US-China trade war—except the US and China