fixed README.md conflict