Fix Gemfile.lock merge driver