Update README.rdoc
fixed merge conflict