Remove merge-conflict in README