User blog comment:ForestFairy/How to resolve conflict/@comment-26123927-20150823004456

Great article. I will use this as an admin.