resolve a conflict紛争 means “conflict” or “dispute,” and 解決 means “resolution” or “solve.” This phrase is commonly used for resolving international, political, or social conflicts.
JA: 話し合いで紛争を解決することが大切です。
EN: It is important to resolve conflicts through discussion.