rebase to working condition