Remove conflict markers left in README.md