pull --rebase is easier than a merge pull