1.txt ABC
2.txt 123
Merge branch 'master' into branch1