Fixed accidental conflict unresolved in README