Looks like you have leftovers from a merge.