diff --git a/Gemfile b/Gemfile
index 7a638451..a2cb1ced 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
+<<<<<<< HEAD
 gem "activerecord-import"
 gem "bcrypt_pbkdf"
 gem "bootsnap", require: false
@@ -33,7 +34,6 @@ gem "watir"
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem "brakeman"
-  gem "bullet"
   gem "dexter"
   gem "erb_lint", require: false
   gem "erblint-github"
@@ -52,6 +52,187 @@ group :development do
   # gem "web-console"
   # gem 'reek', require: false
 end
+||||||| parent of 66fc8f9 (chore: add deprecated gems to gemfile because they will get removed from the ruby standard library in the next version.  Also address security vulnerabilities)
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem "rails", "~> 7.1.3"
+gem "sprockets-rails"
+
+gem "pg"
+
+# Use Puma as the app server
+gem "puma", ">= 6.4.0"
+# Use Uglifier as compressor for JavaScript assets
+gem "uglifier", ">= 1.3.0"
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# Use jquery as the JavaScript library
+gem "jquery-rails"
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem "jbuilder", "~> 2.5"
+# Use Redis adapter to run Action Cable in production
+gem "redis", "~> 3.0"
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+gem "nokogiri"
+
+gem "bootsnap", require: false
+
+gem "haml"
+
+gem "friendly_id", "~> 5.1.0"
+
+gem "newrelic_rpm"
+
+gem "devise", git: "https://github.com/heartcombo/devise"
+
+gem "omniauth"
+
+gem "activerecord-import"
+
+gem "jsbundling-rails"
+
+gem "cssbundling-rails"
+
+gem "turbo-rails"
+
+gem "stimulus-rails"
+
+gem "watir"
+
+gem "bcrypt_pbkdf"
+gem "ed25519"
+gem "net-sftp"
+
+gem "standard_deviation"
+=======
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem "activerecord-import"
+gem "bcrypt_pbkdf"
+gem "bootsnap", require: false
+gem "cssbundling-rails"
+gem "devise", git: "https://github.com/heartcombo/devise"
+gem "ed25519"
+gem "friendly_id", "~> 5.1.0"
+gem "haml"
+gem "jbuilder", "~> 2.5"
+gem "jquery-rails"
+gem "jsbundling-rails"
+gem "logger"
+gem "net-sftp"
+gem "newrelic_rpm"
+gem "nokogiri"
+gem "omniauth"
+gem "ostruct"
+gem "pg"
+gem "puma", ">= 6.4.0"
+gem "rails", "~> 7.1.3"
+gem "redis", "~> 3.0"
+gem "sprockets-rails"
+gem "standard_deviation"
+gem "stimulus-rails"
+gem "turbo-rails"
+gem "uglifier", ">= 1.3.0"
+gem "watir"
+>>>>>>> 66fc8f9 (chore: add deprecated gems to gemfile because they will get removed from the ruby standard library in the next version.  Also address security vulnerabilities)
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem "byebug", platform: :mri
+  gem "dotenv-rails"
+  gem "factory_bot_rails"
+  gem "parallel_tests"
+  gem "rack-mini-profiler"
+  gem "rspec-rails", "~> 6.0.3"
+end
+
+group :test do
+  gem "capybara"
+  gem "cuprite"
+  gem "database_cleaner"
+  gem "launchy"
+  gem "rails-controller-testing"
+  gem "simplecov", require: false
+  # gem "timecop"
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
+
+# gem "reline", "~> 0.3.2"
+gem "puma", ">= 6.4.0"
+# Use Uglifier as compressor for JavaScript assets
+gem "uglifier", ">= 1.3.0"
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# Use jquery as the JavaScript library
+gem "jquery-rails"
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem "jbuilder", "~> 2.5"
+# Use Redis adapter to run Action Cable in production
+gem "redis", "~> 3.0"
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+gem "nokogiri"
+
+gem "bootsnap", require: false
+
+gem "haml"
+
+gem "friendly_id", "~> 5.1.0"
+
+gem "newrelic_rpm"
+
+gem "devise", git: "https://github.com/heartcombo/devise"
+
+gem "omniauth"
+
+gem "activerecord-import"
+
+gem "jsbundling-rails"
+
+gem "cssbundling-rails"
+
+gem "turbo-rails"
+
+gem "stimulus-rails"
+
+gem "watir"
+
+gem "bcrypt_pbkdf"
+gem "ed25519"
+gem "net-sftp"
+
+gem "standard_deviation"
+=======
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem "activerecord-import"
+gem "bcrypt_pbkdf"
+gem "bootsnap", require: false
+gem "cssbundling-rails"
+gem "devise", git: "https://github.com/heartcombo/devise"
+gem "ed25519"
+gem "friendly_id", "~> 5.1.0"
+gem "haml"
+gem "jbuilder", "~> 2.5"
+gem "jquery-rails"
+gem "jsbundling-rails"
+gem "logger"
+gem "net-sftp"
+gem "newrelic_rpm"
+gem "nokogiri"
+gem "omniauth"
+gem "ostruct"
+gem "pg"
+gem "puma", ">= 6.4.0"
+gem "rails", "~> 7.1.3"
+gem "redis", "~> 3.0"
+gem "sprockets-rails"
+gem "standard_deviation"
+gem "stimulus-rails"
+gem "turbo-rails"
+gem "uglifier", ">= 1.3.0"
+gem "watir"
+>>>>>>> 66fc8f9 (chore: add deprecated gems to gemfile because they will get removed from the ruby standard library in the next version.  Also address security vulnerabilities)
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
diff --git a/Gemfile.lock b/Gemfile.lock
index 48dd3598..00aaec21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -209,9 +209,6 @@ GEM
     google-protobuf (4.28.2-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.28.2-x86_64-darwin)
-      bigdecimal
-      rake (>= 13)
     google-protobuf (4.28.2-x86_64-linux)
       bigdecimal
       rake (>= 13)
@@ -536,6 +533,7 @@ DEPENDENCIES
   newrelic_rpm
   nokogiri
   observer (~> 0.1.2)
+  omniauth
   ostruct
   parallel_tests
   pg
diff --git a/yarn.lock b/yarn.lock
index f7c7c388..1e788634 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1804,7 +1804,7 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.3, braces@~3.0.2:
+braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==