Fix merge conflicts

Author: saulshanabrook

python/egglog/__init__.py

@@ -8,6 +8,6 @@
 from .conversion import *
 from .deconstruct import *
 from .egraph import *
-from .runtime import define_expr_method as define_expr_method  # noqa: PLC0414
+from .runtime import define_expr_method as define_expr_method
 
 del ipython_magic

python/egglog/runtime.py

@@ -577,15 +577,15 @@ def __eq__(self, other: object) -> object:  # type: ignore[override]
 
         # TODO: Check if two objects can be upcasted to be the same. If not, then return NotImplemented so other
         # expr gets a chance to resolve __eq__ which could be a preserved method.
-        from .egraph import BaseExpr, eq
+        from .egraph import BaseExpr, eq  # noqa: PLC0415
 
         return eq(cast("BaseExpr", self)).to(cast("BaseExpr", other))
 
     def __ne__(self, other: object) -> object:  # type: ignore[override]
         if (method := _get_expr_method(self, "__ne__")) is not None:
             return method(other)
 
-        from .egraph import BaseExpr, ne
+        from .egraph import BaseExpr, ne  # noqa: PLC0415
 
         return ne(cast("BaseExpr", self)).to(cast("BaseExpr", other))
 
@@ -647,7 +647,7 @@ def _numeric_binary_method(self: object, other: object, name: str = name, r_meth
                 )
             )
         ):
-            from .conversion import CONVERSIONS, resolve_type, retrieve_conversion_decls
+            from .conversion import CONVERSIONS, resolve_type, retrieve_conversion_decls  # noqa: PLC0415
 
             # tuple of (cost, convert_self)
             best_method: (