update b.txt by master
update b.txt by b
update master.txt by a
merge a's modified by master
pulled master data in b