Merged stash
Merged stash, correctly