error in the rebase