Trying to force a conflict
Fixed the conflict in README.md