update b.txt by b
update master.txt by master
remove confilct
update a.txt by c
update a.txt by c