corrected README.md from conflict