Remove conflict marker from README.md