edited README.md
fixed conflicts README.md