modified hello.py
modify hello.py
Fix conflict