chore: fix mergify conflicts in #8483 (#8549)

Author: boojamya

modules/core/02-client/types/codec.go

@@ -1,16 +1,12 @@
 package types
 
 import (
-<<<<<<< HEAD
-	proto "github.com/cosmos/gogoproto/proto"
-=======
-	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	"github.com/cosmos/gogoproto/proto"
->>>>>>> de2f70a4 (fix: support amino encoding on MsgRecoverClient (#8448))
 
 	errorsmod "cosmossdk.io/errors"
 
+	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"

modules/core/02-client/types/tx.pb.go

@@ -1103,7 +1103,7 @@ func (suite *KeeperTestSuite) TestAcknowledgePacket() {
 				path.EndpointB.Chain.App.GetIBCKeeper().ChannelKeeper.SetPacketAcknowledgement(path.EndpointB.Chain.GetContext(), path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, sequence, types.CommitAcknowledgement(ack))
 
 				path.EndpointB.Chain.NextBlock()
-				path.EndpointA.UpdateClient()
+				suite.Require().NoError(path.EndpointA.UpdateClient())
 			},
 			expResult: func(commitment []byte, err error) {
 				suite.Require().Error(err)
@@ -1130,7 +1130,7 @@ func (suite *KeeperTestSuite) TestAcknowledgePacket() {
 				path.EndpointB.Chain.App.GetIBCKeeper().ChannelKeeper.SetPacketAcknowledgement(path.EndpointB.Chain.GetContext(), path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, sequence, types.CommitAcknowledgement(ack))
 
 				path.EndpointB.Chain.NextBlock()
-				path.EndpointA.UpdateClient()
+				suite.Require().NoError(path.EndpointA.UpdateClient())
 			},
 			expResult: func(commitment []byte, err error) {
 				suite.Require().NoError(err)