now using merge instead of rebase