diff --git a/pyproject.toml b/pyproject.toml
index a45f0eee97..be6ef65d51 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20251001.3"
+version      = "20251001.4"
 license      = "Apache-2.0"
 license-files = ["LICENSE*"]
 description  = "The Home Assistant frontend"
diff --git a/src/resources/theme/core.globals.ts b/src/resources/theme/core.globals.ts
index 91e0fa3731..9bcfdd6603 100644
--- a/src/resources/theme/core.globals.ts
+++ b/src/resources/theme/core.globals.ts
@@ -19,8 +19,6 @@ export const coreStyles = css`
     --ha-border-radius-pill: 9999px;
     --ha-border-radius-circle: 50%;
     --ha-border-radius-square: 0;
-<<<<<<< HEAD
-=======
 
     /* Spacing */
     --ha-space-0: 0px;
@@ -44,7 +42,6 @@ export const coreStyles = css`
     --ha-space-18: 72px;
     --ha-space-19: 76px;
     --ha-space-20: 80px;
->>>>>>> 994c1b575 (Fix intl polyfill loading (#27261))
   }
 `;