Merging stashed files