Update README.md
fixed conflit
update