Merge stash code