Is this expected or a leftover from a merge conflict?