User blog comment:ForestFairy/How to resolve conflict/@comment-26858027-20150823164252

This is really cool. Good job