add a new empty line
Merge branch 'branch1'