Remove remnants of merge conflict in README