User blog comment:ForestFairy/How to resolve conflict/@comment-26498997-20150823133539/@comment-25417872-20150823201214

Agreed.