Resolve conflicts

.rubocop.yml

@@ -4,4 +4,4 @@ Style/Documentation:
   Enabled: false
 
 Layout/EndOfLine:
-  Enabled: False
\ No newline at end of file
+  Enabled: False

.rubocop_todo.yml

@@ -133,13 +133,15 @@ Style/ClassAndModuleChildren:
     - 'test/channels/application_cable/connection_test.rb'
     - 'test/test_helper.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: compact, expanded
-Style/EmptyMethod:
-  Exclude:
-    - 'app/controllers/home_controller.rb'
+# Offense count: 3
+# Configuration parameters: AllowedConstants.
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'app/helpers/application_helper.rb'
+    - 'app/models/application_record.rb'
+    - 'config/application.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.