commit branch1
master change after branch1
Merge branch 'branch1'