fixed typo in src
Merge pull request #12 from voidabhi/typo-fix

fixed typo in src
fix merge conflicts
fix merge conflict