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

Agreed