Update README.md
Uptodate and repair the conflicts.