fix some rebase errors