Update README.md

resolve merge conflict.