Uhm... it would be nice to understand which merge conflict caused this. Is there a way to get that information? Who solved the conflict and when? I don't remember seeing code like this in any conflict I have resolved manually, but I use kdiff3 as merge tool, which sometimes solve conflicts automatically. I hope this is a human error and not a tool error. Merge conflicts solved uncorrectly are the most annoying thing that may happen. Other than that, LGTM.