merging stashes