Diplomatic dialogue helped put an end to the conflict.

Finally, the discord between them came to an end.