merger+rebase