rebase and fork