update master.txt by a
update master.txt by b
remove confilct(a change master.txt)  by master
remove confilct(b change master.txt)  by master