Update README.md

test conflict and fix