hello.c changes
conflict
test.c added