merge with stash