edit third file
Merge branch 'fourth_branch'

* fourth_branch:
  merge fourth_branch