old_contents: # Hey hey, I wrote this and commited it to master
  # after the see_merge_conflict branch was cut.
  # This should cause a merge conflict.
new_contents: # Hey hey, I wrote this and committed it to master
  # after the see_merge_conflict branch was cut.
  # This should cause a merge conflict.
subject: fix typo