b.txt modified from master but committed from B1