bnew1 nf1
bnew2 nf2
bnew3 fn3
bnew4 fn4
merged new4
add f1
added f2
Merge branch 'f2'