I'm guessing this was from a merge conflict resolution, but it seems to be resolved incorrectly. Are there other merge conflicts that were incorrectly resolved and hidden in one of the commits?