Resolved README.md merge conflict