edit first and third file, add fifth file
Merge branch 'fourth_branch'

* fourth_branch:
  edit first and third file, add fifth file