update README
merge conflict