I hate conflict and love unity. Is it possible you feel the same way? I will do whatever I can, without violating my conscience, to avoid strife and maintain unity. 

Whenever there is a spark of conflict, I try to remind myself of the root cause of contention before things escalate. “Only by pride cometh contention: but with the well advised is wisdom” (Proverbs 13:10). It takes two proud people for strife. Since I’m one of the two, I can immediately do something to quench the conflict – repent of my pride. Maybe not so easy, but it does work and is a good thing. 

“A man’s pride shall bring him low: but honor shall uphold the humble in spirit” (Proverbs 29:23).

(A requested problem topic)