merge with rebase