Resolved conflicts in Gemfile (rdoc)