fixing broken rebase