update readme
merge conflict