This looks like a merge conflict that wasn't resolved.