add b1file.txt
add m2 file
add b1_file2.txt
Merge branch 'b1'