branch1
master
Merge branch 'branch1'