User blog comment:ForestFairy/How to resolve conflict/@comment-26547247-20150823134918

This looks so great!