commit done at branch1
Merge branch 'branch1' into branch2