diff --git a/.gitignore b/.gitignore
index d160dadbff156..d5197c1f5dd3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,11 +113,8 @@ doc/
 # spec reports
 /spec/reports
 /junit.xml
-<<<<<<< Updated upstream
-=======
 
 /app/assets/builds/*
 !/app/assets/builds/.keep
 
 db/backups
->>>>>>> Stashed changes
diff --git a/Gemfile.lock b/Gemfile.lock
index 94ea423d8359f..bf9cae0f944aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1030,7 +1030,7 @@ DEPENDENCIES
   omniauth-twitter (~> 1.4)
   parallel (~> 1.22)
   pg (~> 1.4)
-  pg_query (= 4.2.3)
+  pg_query (~> 4.2.3)
   pg_search (~> 2.3.6)
   pghero (~> 3.1)
   pry (~> 0.14)
diff --git a/app/models/settings/base.rb b/app/models/settings/base.rb
index 8ade6044a8909..5b350c4ea6aca 100644
--- a/app/models/settings/base.rb
+++ b/app/models/settings/base.rb
@@ -162,8 +162,9 @@ def value
         ActiveSupport::HashWithIndifferentAccess,
         ActiveSupport::TimeWithZone,
         ActiveSupport::TimeZone,
+        Symbol,
       ]
-      YAML.load(self[:value], permitted_classes: permitted_classes) # rubocop:disable Security/YAMLLoad
+      YAML.safe_load(self[:value], permitted_classes: permitted_classes, aliases: true)
     end
 
     # set the settings's value, YAML encoded
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 90a9f5f6394ab..222bcdd354768 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -35,8 +35,7 @@ def not_past_scheduled_time?(current_time)
   sidekiq_url = ApplicationConfig["REDIS_SIDEKIQ_URL"] || ApplicationConfig["REDIS_URL"]
   # On Heroku this configuration is overridden and Sidekiq will point at the redis
   # instance given by the ENV variable REDIS_PROVIDER
-  config.redis = { url: sidekiq_url,
-    ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE } }
+  config.redis = { url: sidekiq_url }
 
   config.server_middleware do |chain|
     chain.add Sidekiq::HoneycombMiddleware
@@ -57,9 +56,6 @@ def not_past_scheduled_time?(current_time)
 end
 
 Sidekiq.configure_client do |config|
-  sidekiq_url = ApplicationConfig["REDIS_SIDEKIQ_URL"] || ApplicationConfig["REDIS_URL"]
-  config.redis = { url: sidekiq_url,
-    ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE } }
   config.client_middleware do |chain|
     chain.add SidekiqUniqueJobs::Middleware::Client
   end