Defusing the US-China Trade Conflict