add m.txt
add b.txt
Merge branch 'b'
test merge branch