Updated README.md file
conflict removed