resolve merge conflict

Sreeram-Shankar · Sreeram-Shankar · commit f89fa9cc73c8 · 2026-04-21T16:07:05.000-05:00
diff --git a/lib/OrdinaryDiffEqFIRK/src/OrdinaryDiffEqFIRK.jl b/lib/OrdinaryDiffEqFIRK/src/OrdinaryDiffEqFIRK.jl
@@ -18,9 +18,9 @@ import OrdinaryDiffEqCore: alg_order, calculate_residuals!,
     fac_default_gamma,
     get_current_adaptive_order, get_fsalfirstlast,
     get_current_alg_order,
-    isfirk, generic_solver_docstring, _bool_to_ADType,
-    _process_AD_choice, LinearAliasSpecifier
-using MuladdMacro, DiffEqBase, RecursiveArrayTools, Polyester
+    isfirk, generic_solver_docstring, _ad_chunksize_int, _ad_fdtype, _fixup_ad,
+    LinearAliasSpecifier
+using MuladdMacro, DiffEqBase, RecursiveArrayTools
 isfirk, generic_solver_docstring
 using SciMLOperators: AbstractSciMLOperator
 using LinearAlgebra: I, UniformScaling, mul!, lu, dot, eigvals
