Update README.md
fixing compilation error
solving merge conflict in test class