correct conflict in README