Fixed merge conflict in README
Merge pull request #49 from elbaschid/fix/readme

Fixed merge conflict in README