fixes merge conflict in README