Update hello.py
fix conflict changes
Merge branch 'o8151814-patch-1'

* o8151814-patch-1:
  Update hello.py