User blog comment:ForestFairy/How to resolve conflict/@comment-252417-20150827013617

Same old, same old.