Why Japan and China are trying to make nice