Remove merge-conflict in README

Last merge had some merge-conflicts
Made the pull request directly to master because that's where the conflict is.