User blog comment:ForestFairy/How to resolve conflict/@comment-36.37.130.159-20150909084231/@comment-24961680-20150909161540

Thank you! :)