Forgot to fix one of the git merge conflicts