fix: resolve conflicts (#1016)

chain/cosmos/account_retriever.go

@@ -15,7 +15,7 @@ import (
 )
 
 var (
-	_ client.Account          = sdk.AccountI(nil)
+	_ client.Account          = authtypes.AccountI(nil)
 	_ client.AccountRetriever = AccountRetriever{}
 )
 
@@ -59,7 +59,7 @@ func (ar AccountRetriever) GetAccountWithHeight(clientCtx client.Context, addr s
 		return nil, 0, fmt.Errorf("failed to parse block height: %w", err)
 	}
 
-	var acc sdk.AccountI
+	var acc authtypes.AccountI
 	if err := clientCtx.InterfaceRegistry.UnpackAny(res.Account, &acc); err != nil {
 		return nil, 0, err
 	}

chain/cosmos/broadcaster.go

@@ -14,16 +14,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
-<<<<<<< HEAD
 	authTx "github.com/cosmos/cosmos-sdk/x/auth/tx"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v7/testutil"
-=======
-	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
-	"github.com/strangelove-ventures/interchaintest/v8/testutil"
->>>>>>> 1d1b837 (feat: replace broadcaster's account retriever to use chain's bech32 prefix when converting AccAddress to string (#1009))
 )
 
 type ClientContextOpt func(clientContext client.Context) client.Context