stash merged