merge and rebase