diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2d239f006..19e3a59a6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -14,7 +14,6 @@ Lint/InheritException:
   Exclude:
     - 'app/controllers/concerns/feature_flags.rb'
 
-<<<<<<< HEAD
 # Offense count: 13
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
@@ -23,13 +22,6 @@ Lint/ParenthesesAsGroupedExpression:
     - 'spec/features/proposals_spec.rb'
     - 'spec/models/debate_spec.rb'
 
-# Offense count: 1
-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.