User blog comment:ForestFairy/How to resolve conflict/@comment-26933310-20150914235344/@comment-24961680-20150917131038

Thank you!