fix merge conflict in readme.md