Fixed merge conflict issue with README.md file