fix conflict resolving

app/controllers/admin/application_settings_controller.rb

@@ -132,12 +132,12 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :elasticsearch_host,
       :elasticsearch_port,
       :usage_ping_enabled,
-      repository_storages: [],
       :enabled_git_access_protocol,
       :repository_size_limit,
       restricted_visibility_levels: [],
       import_sources: [],
-      disabled_oauth_sign_in_sources: []
+      disabled_oauth_sign_in_sources: [],
+      repository_storages: []
     )
   end
 end