rebase instead of merge