rebase and merge