actually fix conflicts

Author: benedikt-bartscher

reflex/vars.py

@@ -7,6 +7,7 @@
 import random
 import re
 import string
+from collections.abc import Callable
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -32,7 +33,7 @@
     ParsedImportDict,
     parse_imports,
 )
-from reflex.utils.types import Self, get_origin, override
+from reflex.utils.types import Self, override
 
 if TYPE_CHECKING:
     from reflex.ivars import ImmutableVar
@@ -502,6 +503,9 @@ def get_uuid_string_var() -> ImmutableVar:
     )
 
 
+VAR_CALLABLE = Callable[[Any], Var]
+
+
 class HybridProperty(property):
     """A hybrid property that can also be used in frontend/as var."""