Merge branch 'refs/heads/branch1'
new file f2
Merge branch 'refs/heads/master' into branch1