diff --git a/.cspell.yml b/.cspell.yml
index 2452d1a60ec6..63d907d68a2a 100644
--- a/.cspell.yml
+++ b/.cspell.yml
@@ -40,7 +40,6 @@ words:
   - appenders
   - aspecto
   - autoconfiguration
-  - autoconfigure
   - autoinstrumentation
   - autoloaded
   - autoloader
@@ -112,8 +111,6 @@ words:
   - otelcol
   - otep
   - otlp
-  - outro
-  - overridable
   - packagist
   - pageinfo
   - Paixão
diff --git a/.github/workflows/check-spelling.yml b/.github/workflows/check-spelling.yml
index a4e145bd4831..841011bee9b4 100644
--- a/.github/workflows/check-spelling.yml
+++ b/.github/workflows/check-spelling.yml
@@ -14,11 +14,15 @@ jobs:
         with:
           # Files should be consistent with check:spelling files
           files: |
+<<<<<<< HEAD
 <<<<<<< HEAD
             content
 =======
             content/en
 >>>>>>> 57cd4f78 ([CI] Try to get streetsidesoftware/cspell-action to play nice (#4975))
+=======
+            content
+>>>>>>> 65fd0c24 ([CI][i18n] Spell check content/pt, and enable other dicts (#4982))
             data
             layouts/**/*.md
           config: .cspell.yml