petes stash
petes stash and merge