Merging from stash