Merging in my stash