Update Readme to remove conflict markers.