recover from rebase