Update README.md

Remove conflicts comments in file.