diff --git a/CHANGELOG.md b/CHANGELOG.md
index e29ab978fb..aa786d27ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,9 +43,19 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Improvements
 
 ### Bug Fixes
+<<<<<<< HEAD
 * (x/auth) [#1281](https://github.com/Finschia/finschia-sdk/pull/1281) `ModuleAccount.Validate` now reports a nil `.BaseAccount` instead of panicking. (backport #1274)
 * (x/foundation) [\#1283](https://github.com/Finschia/finschia-sdk/pull/1283) add init logic of foundation module accounts to InitGenesis in order to eliminate potential panic (backport #1277)
 * (x/collection) [\#1282](https://github.com/Finschia/finschia-sdk/pull/1282) eliminates potential risk for Insufficient Sanity Check of tokenID in Genesis (backport #1276)
+=======
+* chore(deps) [\#1141](https://github.com/Finschia/finschia-sdk/pull/1141) Bump github.com/cosmos/ledger-cosmos-go from 0.12.2 to 0.13.2 to fix ledger signing issue
+* (x/auth, x/slashing) [\#1179](https://github.com/Finschia/finschia-sdk/pull/1179) modify missing changes of converting to tendermint
+* (x/auth) [#1274](https://github.com/Finschia/finschia-sdk/pull/1274) `ModuleAccount.Validate` now reports a nil `.BaseAccount` instead of panicking.
+* (x/collection) [\#1276](https://github.com/Finschia/finschia-sdk/pull/1276) eliminates potential risk for Insufficient Sanity Check of tokenID in Genesis 
+* (x/foundation) [\#1277](https://github.com/Finschia/finschia-sdk/pull/1277) add init logic of foundation module accounts to InitGenesis in order to eliminate potential panic
+* (x/collection, x/token) [\#1288](https://github.com/Finschia/finschia-sdk/pull/1288) use accAddress to compare in validatebasic function in collection & token modules
+* (x/collection) [\#1268](https://github.com/Finschia/finschia-sdk/pull/1268) export x/collection params into genesis
+>>>>>>> e86b98002 (fix: export x/collection params into genesis (#1268))
 
 ### Removed
 
diff --git a/x/collection/keeper/genesis.go b/x/collection/keeper/genesis.go
index 290d8caf48..c4ebef4f46 100644
--- a/x/collection/keeper/genesis.go
+++ b/x/collection/keeper/genesis.go
@@ -211,6 +211,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *collection.GenesisState {
 	contracts := k.getContracts(ctx)
 
 	return &collection.GenesisState{
+		Params:         k.GetParams(ctx),
 		Contracts:      contracts,
 		NextClassIds:   k.getAllNextClassIDs(ctx),
 		Classes:        k.getClasses(ctx, contracts),
diff --git a/x/collection/keeper/genesis_test.go b/x/collection/keeper/genesis_test.go
index fc6c0c836c..e2108aeaca 100644
--- a/x/collection/keeper/genesis_test.go
+++ b/x/collection/keeper/genesis_test.go
@@ -28,3 +28,11 @@ func (s *KeeperTestSuite) TestImportExportGenesis() {
 	newGenesis := s.keeper.ExportGenesis(s.ctx)
 	s.Require().Equal(genesis, newGenesis)
 }
+
+func (s *KeeperTestSuite) TestExportGenesis() {
+	genesis := s.keeper.ExportGenesis(s.ctx)
+
+	params := genesis.Params
+	s.Require().NotZero(params.DepthLimit)
+	s.Require().NotZero(params.WidthLimit)
+}