add hello.c
add file and commit
resolve conflict