Remove leftover from an incomplete rebase