Update README.rdoc
Update README.rdoc
Update README.rdoc
Update README.rdoc
Update README.rdoc
README change
conflict resolution
conflict resolution