The trade war is already over