b1 c1
b1 commit 2
new a common file
merge b1