Dummy code to demonstrate merge conflict resolution. (#X)
Merge pull request #5 from jmewes/show-merge-process_v2

Dummy code to demonstrate merge conflict resolution. (#X)