User blog comment:ForestFairy/How to resolve conflict/@comment-85.193.154.170-20150820232231

Helped a lot. Genuine thanks