diff --git a/x/upgrade/depinject.go b/x/upgrade/depinject.go
index d12c0ea9a3b3..50165afbf04d 100644
--- a/x/upgrade/depinject.go
+++ b/x/upgrade/depinject.go
@@ -6,6 +6,7 @@ import (
 	modulev1 "cosmossdk.io/api/cosmos/upgrade/module/v1"
 	"cosmossdk.io/core/address"
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/codec"
 	coreserver "cosmossdk.io/core/server"
 	"cosmossdk.io/depinject"
 	"cosmossdk.io/depinject/appconfig"
@@ -13,8 +14,11 @@ import (
 	"cosmossdk.io/x/upgrade/types"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
+<<<<<<< HEAD
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server"
+=======
+>>>>>>> ea78b3c5b (chore(x/upgrade): Use `cosmossdk.io/core/codec` instead of `github.com/cosmos/cosmos-sdk/codec` (#23261))
 	"github.com/cosmos/cosmos-sdk/types/module"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 )
diff --git a/x/upgrade/keeper/keeper.go b/x/upgrade/keeper/keeper.go
index a7e54a68dc6a..2a32f3957099 100644
--- a/x/upgrade/keeper/keeper.go
+++ b/x/upgrade/keeper/keeper.go
@@ -14,13 +14,13 @@ import (
 	"github.com/hashicorp/go-metrics"
 
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/core/server"
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/store/prefix"
 	storetypes "cosmossdk.io/store/types"
 	"cosmossdk.io/x/upgrade/types"
 
-	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/runtime"
 	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"