Add README.md
fix README conflict