Edited README.md
merging changes from test
Resolved conflict