Oops, didn't mean to include these changes.

Author: contradict

src/systems/nonlinear/initializesystem.jl

@@ -662,13 +662,7 @@ function SciMLBase.remake_initialization_data(
     kws = maybe_build_initialization_problem(
         sys, SciMLBase.isinplace(odefn), op, t0, defs, guesses,
         missing_unknowns; time_dependent_init, use_scc, initialization_eqs, floatT,
-<<<<<<< Updated upstream
         u0_constructor, p_constructor, allow_incomplete = true)
-||||||| Stash base
-        u0_constructor, p_constructor, allow_incomplete = true, check_units=false)
-=======
-        u0_constructor, p_constructor, allow_incomplete = true, check_units = false)
->>>>>>> Stashed changes
 
     odefn = remake(odefn; kws...)
     return SciMLBase.remake_initialization_data(sys, odefn, newu0, t0, newp, newu0, newp)

test/initializationsystem.jl

@@ -1112,18 +1112,6 @@ end
         guesses = ModelingToolkit.missing_variable_defaults(pend))
     sol = solve(prob, Rodas5P())
     @test SciMLBase.successful_retcode(sol)
-<<<<<<< Updated upstream
-||||||| Stash base
-
-    prob2 = remake(prob, u0=[x => 0.5, y=>nothing])
-    sol2 = solve(prob2, Rodas5P())
-    @test SciMLBase.successful_retcode(sol2)
-=======
-
-    prob2 = remake(prob, u0 = [x => 0.5, y=>nothing])
-    sol2 = solve(prob2, Rodas5P())
-    @test SciMLBase.successful_retcode(sol2)
->>>>>>> Stashed changes
 end
 
 @testset "Issue#3205" begin