add 2 in a.txt
merge B1 in master