rebase after fail