chore: fix mergify conflicts in #8483#8549

gjermundgaraba merged 2 commits intocosmos:mergify/bp/release/v8.8.x/pr-8448cosmos/ibc-go:mergify/bp/release/v8.8.x/pr-8448from

noble-assets:dan/fix-mergify-conflictsnoble-assets/ibc-go:dan/fix-mergify-conflictsCopy head branch name to clipboard