lets conflict a merge
Merge pull request #17 from cmoy/feature/conflict

lets conflict a merge