Update README.md
resolve merge conflict
Merge branch 'silky-master'