User blog comment:ForestFairy/How to resolve conflict/@comment-36.37.224.25-20150915113916/@comment-24961680-20150917131004

Thanks. That is very sweet!