add foo.c
merge from b1