fix merge conflicts in readme
fix merge conflicts