Resolve conflict in README