Update file2
Merge branch 'branch1'