add b1-f1 from branch1
modify f1
Merge branch 'master' into branch1