Fix bad merge
Merge pull request #22 from dimagi/fix-merge

Fix bad merge