diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2cda5e987..876df28eb 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,6 +6,16 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+<<<<<<< HEAD
+=======
+# Offense count: 35
+# Configuration parameters: EnforcedStyle, AllowedGems.
+# SupportedStyles: required, forbidden
+Bundler/GemVersion:
+  Exclude:
+    - 'Gemfile'
+
+>>>>>>> 58b372a (Rubocop: fix EmptyLineAfterMagicComment lints (#1416))
 # Offense count: 3
 Capybara/RSpec/NegationMatcherAfterVisit:
   Exclude:
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
new file mode 100644
index 000000000..6d56e4390
--- /dev/null
+++ b/config/initializers/application_controller_renderer.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Be sure to restart your server when you modify this file.
+
+# ActiveSupport::Reloader.to_prepare do
+#   ApplicationController.renderer.defaults.merge!(
+#     http_host: 'example.org',
+#     https: false
+#   )
+# end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
new file mode 100644
index 000000000..be6fedc53
--- /dev/null
+++ b/config/initializers/mime_types.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb
index e8d0b2ae8..840390abc 100644
--- a/config/initializers/permissions_policy.rb
+++ b/config/initializers/permissions_policy.rb
@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+<<<<<<< HEAD
 # Be sure to restart your server when you modify this file.
 
+=======
+>>>>>>> 58b372a (Rubocop: fix EmptyLineAfterMagicComment lints (#1416))
 # Define an application-wide HTTP permissions policy. For further
 # information see: https://developers.google.com/web/updates/2018/06/feature-policy