improves the readme
Update README.md
current war style
conflict fix
conflict fix