fix up rebase issues