fixing rebase errors