Senior diplomat says both sides agree on how to manage their dispute