I changed the README.rdoc
Fixed conflicts