Looks like git didn't clean up after a merge.