Fix merge conflicts

Author: ErikQQY

lib/BoundaryValueDiffEqCore/src/BoundaryValueDiffEqCore.jl

@@ -32,8 +32,8 @@ include("alg_utils.jl")
 include("default_nlsolve.jl")
 include("calc_errors.jl")
 
-function SciMLBase.__solve(
-        prob::AbstractBVProblem, alg::BoundaryValueDiffEqAlgorithm, args...; kwargs...)
+function SciMLBase.__solve(prob::AbstractBVProblem,
+        alg::AbstractBoundaryValueDiffEqAlgorithm, args...; kwargs...)
     cache = SciMLBase.__init(prob, alg, args...; kwargs...)
     return SciMLBase.solve!(cache)
 end

lib/BoundaryValueDiffEqMIRKN/src/BoundaryValueDiffEqMIRKN.jl

@@ -18,7 +18,8 @@ using BoundaryValueDiffEqCore: AbstractBoundaryValueDiffEqAlgorithm,
                                __flatten_initial_guess, __build_solution, __Fix3,
                                __default_sparse_ad, __default_nonsparse_ad, get_dense_ad,
                                concrete_jacobian_algorithm, __default_coloring_algorithm,
-                               __default_sparsity_detector, interval, __split_kwargs, NoErrorControl
+                               __default_sparsity_detector, interval, __split_kwargs,
+                               NoErrorControl
 
 using ConcreteStructs: @concrete
 using DiffEqBase: DiffEqBase