update b.txt by b
pulled master data in b
merge b by master