add README.md
conflict removed