update master.txt by a
merge a's modified by master