rebase instead of pulling to get rid of merge master branch objects