User blog comment:ForestFairy/How to resolve conflict/@comment-36.37.130.159-20150909084231/@comment-25417872-20150913005507

You all are excellent! You have the great ideas! :D