diff --git a/go.mod b/go.mod
index b0f8bf4fe9..38bb047354 100644
--- a/go.mod
+++ b/go.mod
@@ -153,8 +153,7 @@ require (
 replace (
 	// TODO: fix keyring upstream
 	github.com/99designs/keyring => github.com/crypto-org-chain/keyring v1.1.6-fixes
-	// release/v0.45.x branch, TODO use tag when released
-	github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.2-0.20220209090836-4161d2b6022a
+	github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.2-0.20220218085826-7f949c0aa1d6
 
 	// TODO: remove when middleware will be implemented
 	github.com/cosmos/ibc-go/v2 => github.com/crypto-org-chain/ibc-go/v2 v2.0.2-hooks
diff --git a/go.sum b/go.sum
index 28e834d750..2c0893c6a9 100644
--- a/go.sum
+++ b/go.sum
@@ -233,8 +233,8 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44=
 github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU=
-github.com/cosmos/cosmos-sdk v0.45.2-0.20220209090836-4161d2b6022a h1:VyCw2TF4lUBe7oQ8MCv9QX+JsAO40SmlAp/F08tix3I=
-github.com/cosmos/cosmos-sdk v0.45.2-0.20220209090836-4161d2b6022a/go.mod h1:XXS/asyCqWNWkx2rW6pSuen+EVcpAFxq6khrhnZgHaQ=
+github.com/cosmos/cosmos-sdk v0.45.2-0.20220218085826-7f949c0aa1d6 h1:GeiTHKpD97wWrX+nWKQgpO3+5ttAZZ4SqE4RlieLS3E=
+github.com/cosmos/cosmos-sdk v0.45.2-0.20220218085826-7f949c0aa1d6/go.mod h1:XXS/asyCqWNWkx2rW6pSuen+EVcpAFxq6khrhnZgHaQ=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
diff --git a/gomod2nix.toml b/gomod2nix.toml
index 0953461147..6abeb56508 100644
--- a/gomod2nix.toml
+++ b/gomod2nix.toml
@@ -967,12 +967,22 @@
     sha256 = "10x22k92ra1sdddj2pksprfhsm683sldflcnjm8nfz4rjjhjwkay"
 
 ["github.com/cosmos/cosmos-sdk"]
+<<<<<<< HEAD
   sumVersion = "v0.45.2-0.20220209090836-4161d2b6022a"
   ["github.com/cosmos/cosmos-sdk".fetch]
     type = "git"
     url = "https://github.com/cosmos/cosmos-sdk"
     rev = "4161d2b6022a59ad859265a0e2483eb8e9b2f84d"
     sha256 = "10jy4vyxy8xqy0ria0zf5cvkdf6ryfnyv8klvkn0w72qyiy1jxgf"
+=======
+  sumVersion = "v0.45.1-debug-query-result"
+  vendorPath = "github.com/yihuang/cosmos-sdk"
+  ["github.com/cosmos/cosmos-sdk".fetch]
+    type = "git"
+    url = "https://github.com/yihuang/cosmos-sdk"
+    rev = "9681d0e25e20f3052ee6cd1f9e390b3ea5680c60"
+    sha256 = "0w53f4lzxppz1nbh331sp9lkcs7pcx1zv5axrwnhhbfvxn2dznwj"
+>>>>>>> 501c97f (Problem: debug mode query result don't show panic info)
 
 ["github.com/cosmos/go-bip39"]
   sumVersion = "v1.0.0"