Yeah, consistency is spotty, but now's our chance to raise the bar!  Fix the conflict with master and that's good enough, unless you want to do a quick consistency pass too