User blog comment:ForestFairy/How to resolve conflict/@comment-36.37.224.57-20150827093957

Great job ForestFairy! Now conflicts are solved