fixed gemfile merge