Gemfile lock merge