stash mount/main.py changes for merge