updated rubygems source
Resolved Merge Conflict