ok
hello.c file is commited on local machine
conflict in masetr
conflict in greet
solved
at master
At greet
conflict solved