User blog comment:ForestFairy/How to resolve conflict/@comment-5111452-20150827065923/@comment-24055022-20150827135354

Yeah, that's definitely overkill. I mean, how do you even remember about it a whole year later?