Update README.md
Update README.md
Adding TOC to README.md
Fixing conflict