modified readme
fixing merge conflict