fix some rebase issues