Forgot to remove merge conflict line