fix merge and remove unnecessary fn

docs/versioned_docs/version-v4.6.x/02-apps/02-interchain-accounts/03-active-channels.md

@@ -16,11 +16,7 @@ channel type that provides ordering of packets without the channel closing on ti
 When an Interchain Account is registered using the `RegisterInterchainAccount` API, a new channel is created on a particular port. During the `OnChanOpenAck` and `OnChanOpenConfirm` steps (controller & host chain) the `Active Channel` for this interchain account
 is stored in state.
 
-<<<<<<< HEAD:docs/versioned_docs/version-v4.6.x/02-apps/02-interchain-accounts/03-active-channels.md
-It is possible to create a new channel using the same controller chain portID if the previously set `Active Channel` is now in a `CLOSED` state. This channel creation can be initialized programmatically by sending a new `MsgChannelOpenInit` message like so:
-=======
 It is possible to create a new channel using the same controller chain portID if the previously set `Active Channel` is now in a `CLOSED` state. This channel creation can be initialized programatically by sending a new `MsgChannelOpenInit` message like so:
->>>>>>> docs: document that version string can be empty as argument of RegisterInterchainAccount (#1582):docs/apps/interchain-accounts/active-channels.md
 
 ```go
 msg := channeltypes.NewMsgChannelOpenInit(portID, string(versionBytes), channeltypes.ORDERED, []string{connectionID}, icatypes.PortID, icatypes.ModuleName)

modules/core/04-channel/keeper/keeper.go

@@ -338,18 +338,6 @@ func (k *Keeper) IteratePacketSequence(ctx context.Context, iterator db.Iterator
 	}
 }
 
-// GetAllPacketSendSeqs returns all stored next send sequences.
-func (k *Keeper) GetAllPacketSendSeqsV1(ctx context.Context) (seqs []types.PacketSequence) {
-	store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
-	iterator := storetypes.KVStorePrefixIterator(store, []byte(host.KeyNextSeqSendPrefix))
-	k.IteratePacketSequence(ctx, iterator, func(portID, channelID string, nextSendSeq uint64) bool {
-		ps := types.NewPacketSequence(portID, channelID, nextSendSeq)
-		seqs = append(seqs, ps)
-		return false
-	})
-	return seqs
-}
-
 func (k *Keeper) GetAllPacketSendSeqs(ctx context.Context) (seqs []types.PacketSequence) {
 	store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
 	iterator := storetypes.KVStorePrefixIterator(store, []byte(hostv2.NextSequenceSendKeyPrefix))