merge stockemy.py