Update README.md
make changes to newfeature branch
resolve branch merge conflict