fix bad merge
Merge pull request #444 from onepercentclub/feature/fix-bad-merge

Fix bad merge