User blog comment:ForestFairy/How to resolve conflict/@comment-98.26.240.95-20150823215320

All good info to go by.