I wonder if it was an automatic merge or whether someone just didn't eyeball the code properly?

That's scary... this is why I'm unhappy with merge tools that don't understand the underlying language

Ok this sounds legit. Thank you. But if you think about this carefully it means that two people wrote the exact same expression in different scopes, which seems really, really odd, no? I'm trying to contrive this in my mind and I'm having difficulty (my fault, obvs).

If this happens again it deserves its own blog post describing the situation carefully!