updated gems
fixed gemfile merge