Remove conflict marker.
Update README.