User blog comment:ForestFairy/How to resolve conflict/@comment-5111452-20150827065923/@comment-4948575-20150827224605

I uh... never mind. Was going to smart off about Microsoft Word correcting my spelling of colour, but that's how these conflicts start, am I right?