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

Thank you very much!