updated README.md
fixed conflict