add 1 file,modify 1 file
Update 1.c
add 2 files
Create 3.c
xx
edit conflict