You forgot to solve the merge conflict :(