fix merge conflict in readme
fixes more readme conflicts