Fix bad conflict resolution

app/helpers/license_helper.rb

@@ -78,7 +78,8 @@ module LicenseHelper
   def show_promotions?(selected_user = current_user)
     return false unless selected_user
 
-    if Gitlab::CurrentSettings.should_check_namespace_plan?
+    if Gitlab::CurrentSettings.current_application_settings
+      .should_check_namespace_plan?
       true
     else
       license = License.current