hello b
b remove john
new c
c remove unused code
add bbbbb
hello b
b remove john
new c
c remove unused code
fixed conflict c file