Japan and China have been feuding over a range of territorial and diplomatic disputes , including claims to the undersea gas deposits .