diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e0e05649231..df04c674b273 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,7 +68,14 @@ Security Release. No breaking changes related to 0.44.x.
 
 ### Bug Fixes
 
+<<<<<<< HEAD
 * [\#9969](https://github.com/cosmos/cosmos-sdk/pull/9969) fix: use keyring in config for add-genesis-account cmd.
+=======
+* [\#10414](https://github.com/cosmos/cosmos-sdk/pull/10414) Use `sdk.GetConfig().GetFullBIP44Path()` instead `sdk.FullFundraiserPath` to generate key
+* (rosetta) [\#10340](https://github.com/cosmos/cosmos-sdk/pull/10340) Use `GenesisChunked(ctx)` instead `Genesis(ctx)` to get genesis block height
+* (client) [#10226](https://github.com/cosmos/cosmos-sdk/pull/10226) Fix --home flag parsing. 
+* [#10180](https://github.com/cosmos/cosmos-sdk/issues/10180) Documentation: make references to Cosmos SDK consistent
+>>>>>>> 33737f4d8 (fix: use sdk.config hdpath (#10414))
 * (x/genutil) [#10104](https://github.com/cosmos/cosmos-sdk/pull/10104) Ensure the `init` command reads the `--home` flag value correctly.
 * (x/feegrant) [\#10049](https://github.com/cosmos/cosmos-sdk/issues/10049) Fixed the error message when `period` or `period-limit` flag is not set on a feegrant grant transaction.
 
diff --git a/server/init.go b/server/init.go
index 389b231e9975..e66a823d9d8b 100644
--- a/server/init.go
+++ b/server/init.go
@@ -12,7 +12,11 @@ import (
 // phrase to recover the private key.
 func GenerateCoinKey(algo keyring.SignatureAlgo) (sdk.AccAddress, string, error) {
 	// generate a private key, with recovery phrase
+<<<<<<< HEAD
 	info, secret, err := keyring.NewInMemory().NewMnemonic("name", keyring.English, sdk.FullFundraiserPath, keyring.DefaultBIP39Passphrase, algo)
+=======
+	k, secret, err := keyring.NewInMemory(cdc).NewMnemonic("name", keyring.English, sdk.GetConfig().GetFullBIP44Path(), keyring.DefaultBIP39Passphrase, algo)
+>>>>>>> 33737f4d8 (fix: use sdk.config hdpath (#10414))
 	if err != nil {
 		return sdk.AccAddress([]byte{}), "", err
 	}
@@ -43,7 +47,11 @@ func GenerateSaveCoinKey(keybase keyring.Keyring, keyName string, overwrite bool
 		}
 	}
 
+<<<<<<< HEAD
 	info, secret, err := keybase.NewMnemonic(keyName, keyring.English, sdk.FullFundraiserPath, keyring.DefaultBIP39Passphrase, algo)
+=======
+	k, secret, err := keybase.NewMnemonic(keyName, keyring.English, sdk.GetConfig().GetFullBIP44Path(), keyring.DefaultBIP39Passphrase, algo)
+>>>>>>> 33737f4d8 (fix: use sdk.config hdpath (#10414))
 	if err != nil {
 		return sdk.AccAddress([]byte{}), "", err
 	}