Update README.md

updated a link
fixed conflict