a new file on branch1
another file on branch 1
added file seven
Merge branch 'master' into branch1