User blog comment:ForestFairy/How to resolve conflict/@comment-416633-20150821113732

The best way to resolve conflict is not to get involved in it in the first place. Simply remove yourself from the situation as quickly as possible if you see trouble brewing. Always works for me.