merge & fix hi.py