Remove merge conflict markers from README file.