test stash and cherry pick