my second commit, starting a new branch1
Merge branch 'branch1'