争議は円満に解決した。

The dispute was settled peacefully.

Nguồn: tatoeba