Looks like a merge conflict that wasn't resolved.