commit and change in branch1
Edited 1.txt in branch1
Merge branch 'master' into branch1
Merge branch 'branch1'