User blog comment:ForestFairy/How to resolve conflict/@comment-36.37.130.159-20150909084231/@comment-36.37.224.25-20150913005328

Your welcome