update readme
solve merge conflict