Fix broken rebase