争議は円満に解決した。
The dispute was settled peacefully.
contend, dispute, argue
ソウ / あらそ.う
deliberation, consultation, debate, consideration
ギ / —