Forgot to remove merge conflicts