diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py
index 281729f263d7..c202a3e7bec4 100644
--- a/homeassistant/helpers/entity_registry.py
+++ b/homeassistant/helpers/entity_registry.py
@@ -16,7 +16,11 @@ from datetime import datetime, timedelta
 from enum import Enum, StrEnum
 import logging
 import time
+<<<<<<< HEAD
 from typing import TYPE_CHECKING, Any, Literal, NotRequired, TypedDict, override
+=======
+from typing import TYPE_CHECKING, Any, Literal, NotRequired, TypedDict
+>>>>>>> db2b796c904 (Fix)
 
 import attr
 import probatio