fix some rebase conflicts