Stashing changes to switch branches and hack in a deliver