Update README.md
sovle confilct
Merge branch 'jessyli-master'