README.md: TODO updates
merge conflict resolved