Merge from stash