Removes merge conflict marks in README.rdoc