update master by master
update a.txt by a
merge master.txt by a
update a.txt by a
update b.txt by a