Update README.rdoc
Fixed merge confict with upstream