You've got a merge conflict here that you need to solve