updated readme
merge conflict