removed rmagick
fixed gemfile merge conflict