trying to fix merge conflict in README.md