now using stash, pull with rebase, and stash pop to get the best workflow