Resolve conflicts with main

Author: jessegrabowski

pytensor/link/numba/dispatch/basic.py

@@ -37,7 +37,7 @@
 from pytensor.tensor.blas import BatchedDot
 from pytensor.tensor.math import Dot
 from pytensor.tensor.shape import Reshape, Shape, Shape_i, SpecifyShape
-from pytensor.tensor.slinalg import Solve
+from pytensor.tensor.slinalg import Cholesky, Solve
 from pytensor.tensor.subtensor import (
     AdvancedIncSubtensor,
     AdvancedIncSubtensor1,
@@ -808,6 +808,7 @@ def softplus(x):
 
     return softplus
 
+
 @numba_funcify.register(Cholesky)
 def numba_funcify_Cholesky(op, node, **kwargs):
     lower = op.lower