Still the two nations are entangled in a wide range of disputes, including those related to Japan's military occupation of China that ended in 1945, rival claims to rich gas reserves and other territorial disputes.