Update hello.c

a conflict test on master