update a.txt by master
update b.txt by master
update b.txt by b
x?