diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2a7113d18..360baeee1 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -14,6 +14,7 @@ Lint/InheritException:
   Exclude:
     - 'app/controllers/concerns/feature_flags.rb'
 
+<<<<<<< HEAD
 # Offense count: 13
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
@@ -27,6 +28,8 @@ Lint/UnderscorePrefixedVariableName:
   Exclude:
     - 'lib/manager_authenticator.rb'
 
+=======
+>>>>>>> 0da0d145c... Fix Lint/UnderscorePrefixedVariableName issue and remove it from rubocop_todo file
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
diff --git a/lib/manager_authenticator.rb b/lib/manager_authenticator.rb
index 2d8e6f1f9..bd61d97a5 100644
--- a/lib/manager_authenticator.rb
+++ b/lib/manager_authenticator.rb
@@ -5,7 +5,7 @@ class ManagerAuthenticator
   end
 
   def auth
-    return false unless [@manager[:login], @manager[:user_key], @manager[:date]].all? {|_| _.present?}
+    return false unless [@manager[:login], @manager[:user_key], @manager[:date]].all? {|manager| manager.present?}
     return @manager if manager_exists? && application_authorized?
     false
   end
@@ -41,4 +41,4 @@ class ManagerAuthenticator
     def application_key
       Rails.application.secrets.managers_application_key.to_s
     end
-end
\ No newline at end of file
+end