branch of feature1 update test.txt's line 1
 branch of master update test.txt's line 1
merge branch master and feature1