Use rebase instead of merge