diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed47aeb34cf8..8370cb5a63f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,7 +43,21 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 ### Improvements
 
 * (genutil) [#21701](https://github.com/cosmos/cosmos-sdk/pull/21701) Improved error messages for genesis validation.
+<<<<<<< HEAD
 * (runtime) [#21704](https://github.com/cosmos/cosmos-sdk/pull/21704) Move `upgradetypes.StoreLoader` to runtime and alias it in upgrade for backward compatibility.
+=======
+
+### Bug Fixes
+
+* (baseapp) [#21256](https://github.com/cosmos/cosmos-sdk/pull/21256) Halt height will not commit the block indicated, meaning that if halt-height is set to 10, only blocks until 9 (included) will be committed. This is to go back to the original behavior before a change was introduced in v0.50.0.
+* (runtime) [#21769](https://github.com/cosmos/cosmos-sdk/pull/21769) Fix baseapp options ordering to avoid overwriting options set by modules.
+
+### API Breaking Changes
+
+* (sims)[#21613](https://github.com/cosmos/cosmos-sdk/pull/21613) Add sims2 framework and factory methods for simpler message factories in modules
+
+### Deprecated
+>>>>>>> b98795f3b (fix(runtime): fix option order (#21769))
 
 ## [v0.52.0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.52.0) - 2024-XX-XX
 
diff --git a/runtime/builder.go b/runtime/builder.go
index 68b58b66a000..37be02fa769e 100644
--- a/runtime/builder.go
+++ b/runtime/builder.go
@@ -39,9 +39,18 @@ func (a *AppBuilder) Build(db corestore.KVStoreWithBatch, traceStore io.Writer,
 		baseAppOptions = append(baseAppOptions, option)
 	}
 
+	// set routers first in case they get modified by other options
+	baseAppOptions = append(
+		[]func(*baseapp.BaseApp){
+			func(bApp *baseapp.BaseApp) {
+				bApp.SetMsgServiceRouter(a.app.msgServiceRouter)
+				bApp.SetGRPCQueryRouter(a.app.grpcQueryRouter)
+			},
+		},
+		baseAppOptions...,
+	)
+
 	bApp := baseapp.NewBaseApp(a.app.config.AppName, a.app.logger, db, nil, baseAppOptions...)
-	bApp.SetMsgServiceRouter(a.app.msgServiceRouter)
-	bApp.SetGRPCQueryRouter(a.app.grpcQueryRouter)
 	bApp.SetCommitMultiStoreTracer(traceStore)
 	bApp.SetVersion(version.Version)
 	bApp.SetInterfaceRegistry(a.app.interfaceRegistry)