US, China, to ‘work through’ naval row