User blog comment:ForestFairy/How to resolve conflict/@comment-11038986-20150821084146

Wow, the Thomas wiki needed this