User blog comment:ForestFairy/How to resolve conflict/@comment-26867238-20150830101736

Nice and useful.