This looks like a duplicate from the other file.  Was this a mistake from the merge/rebase we did?