James 4:7-10
Submit yourselves, then, to God. Resist the devil, and he will flee from you. Come near to God and he will come near to you. Wash your hands, you sinners, and purify your hearts, you double-minded. Grieve, mourn and wail. Change your laughter to mourning and your joy to gloom.
Humble yourselves before the Lord, and he will lift you up.

In resolving conflict we need to repent of sinful selfishness and present ourselves in humility.

To resolve conflict, we need to learn forgiveness and tolerance