Adding file #3
Merge branch 'branch1'
Adding new content
Adding file #2
Merge branch 'master' into branch1