Update README.md
Fix conflict
Delete readme.rdoc