Hmm. This was a merge conflict. You should resolve it.