making some conflict
fixing the merge conflict, seeign what it does to the pull request
Merge pull request #5 from weaties/mytopic

This should conflict - let me see what is going to happen here, and if I can then fix it