fixes readme
merge conflict