fixed rubygems gems again
fixed merge conflicts