use git rebase instead of merge to handle pulls