README.md updated
merge conflicts fixed