Removing git merge line thing