Update README.md

Added conflicting line at 6
Merge pull request #4 from jimgong92/readme-edits

Update README.md