User blog comment:ForestFairy/How to resolve conflict/@comment-25492843-20150823000856

You can't