hello.py has mememe
merge the conflict on hello.py