Update README
Merge confilt resolved on README.md file