Update README.md

Fixed git merge issues