Update README.md
fix conflict
Merge branch 'develop'
Update README.md