new file2 in branch1
Merge branch 'brnh1'