conflict diplomatic china