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