Merge and rebase