updating the README
fixing merge conflict