rebase errors fixed