made a change on branch branch1
file3
Merge branch 'branch1'
merge message here