finished rebasing