new branch commit
update test.txt by branch1
update test.txt by master
conflict fixed