create file 3 on branch 2
Merge branch 'branch-2'