rebase to fresh *nix