merge instead of rebase