change hello.py by jason
conflict fixed