Modified README.md to remove conflict markers.