creating a merge conflict
Merge pull request #3 from ShirleyS/merge_nightmare

creating a merge conflict