add a printf()
add a printf()
conflict fixed
modified a.c correctlly