docs: document that version string can be empty as argument of Regist…

…erInterchainAccount (#1582)

Co-authored-by: Carlos Rodriguez <[email protected]>

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

@@ -16,7 +16,11 @@ 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)