diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac57841012df..63885567dd6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,11 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 * (x/bank) [#21460](https://github.com/cosmos/cosmos-sdk/pull/21460) Added `Sender` attribute in `MsgMultiSend` event.
 * (genutil) [#21701](https://github.com/cosmos/cosmos-sdk/pull/21701) Improved error messages for genesis validation.
+<<<<<<< HEAD
+=======
+* (sims) [#21613](https://github.com/cosmos/cosmos-sdk/pull/21613) Add sims2 framework and factory methods for simpler message factories in modules
+* (testutil/integration) [#21816](https://github.com/cosmos/cosmos-sdk/pull/21816) Allow to pass baseapp options in `NewIntegrationApp`.
+>>>>>>> bdda21f2f (feat(testutil/integration): allow to pass baseapp options (#21816))
 
 ### Bug Fixes
 
diff --git a/testutil/integration/router.go b/testutil/integration/router.go
index a96c7d72d197..f7028b3e1b6e 100644
--- a/testutil/integration/router.go
+++ b/testutil/integration/router.go
@@ -47,6 +47,12 @@ func NewIntegrationApp(
 	keys map[string]*storetypes.KVStoreKey,
 	appCodec codec.Codec,
 	modules map[string]appmodule.AppModule,
+<<<<<<< HEAD
+=======
+	msgRouter *baseapp.MsgServiceRouter,
+	grpcRouter *baseapp.GRPCQueryRouter,
+	baseAppOptions ...func(*baseapp.BaseApp),
+>>>>>>> bdda21f2f (feat(testutil/integration): allow to pass baseapp options (#21816))
 ) *App {
 	db := dbm.NewMemDB()
 
@@ -55,8 +61,13 @@ func NewIntegrationApp(
 	basicModuleManager := module.NewBasicManagerFromManager(moduleManager, nil)
 	basicModuleManager.RegisterInterfaces(interfaceRegistry)
 
+<<<<<<< HEAD
 	txConfig := authtx.NewTxConfig(codec.NewProtoCodec(interfaceRegistry), authtx.DefaultSignModes)
 	bApp := baseapp.NewBaseApp(appName, logger, db, txConfig.TxDecoder(), baseapp.SetChainID(appName))
+=======
+	txConfig := authtx.NewTxConfig(codec.NewProtoCodec(interfaceRegistry), addressCodec, validatorCodec, authtx.DefaultSignModes)
+	bApp := baseapp.NewBaseApp(appName, logger, db, txConfig.TxDecoder(), append(baseAppOptions, baseapp.SetChainID(appName))...)
+>>>>>>> bdda21f2f (feat(testutil/integration): allow to pass baseapp options (#21816))
 	bApp.MountKVStores(keys)
 
 	bApp.SetInitChainer(func(_ sdk.Context, _ *cmtabcitypes.RequestInitChain) (*cmtabcitypes.ResponseInitChain, error) {