Create test1.c

create branch1
Update test1.c
Update test.c
conflet modify test.c