corrected rebase/reset