test1
test2
test2
Create text2.txt
Merge branch 'test1' into test2