Remove merge-conflict in README

Last merge had some merge-conflicts