[#24] Add a comment to cause a conflict

* Testing Pull Request functionality on conflicts, no change in
  behavior