fix merge conflict
Merge pull request #4 from charliegerard/master

fix merge conflict