Update README.md

removed merege conflict text