merge stash