b2 continue changing file1.c
merged with master