file 1 update
file 2 update
update file 3
Merge branch 'file1_branch'

* file1_branch:
  file 2 update
  file 1 update