What does scripture say about resolving conflict?

I would suggest reading the following verses. I hope this is a help mate. 

Ephesians 4:31: Let all bitterness and wrath and anger and clamor and slander be put away from you, along with all malice.
Corinthians 13:11
Romans 15:5; Hebrews 12:14
John 13:34; Romans 12:10

Answer volcanic outgassing;