Remove merge-conflict in README
Merge pull request #156 from heavyplayer2/patch-2

Remove merge-conflict in README