changed to readme.md
Fixed conflict.