fix changelog conflicts

.github/workflows/build.yml

@@ -18,7 +18,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-arch: ["amd64", "arm", "arm64"]
+        # go-arch: ["amd64", "arm", "arm64"]
+        go-arch: ["amd64", "arm64"] # drop 32 bit support for now (and maybe forever)
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5

.github/workflows/dependabot-update-all.yml

@@ -2,6 +2,7 @@ name: Dependabot Update All Go Modules
 on: pull_request
 
 permissions:
+  contents: write
   pull-requests: write
 
 env:
@@ -16,8 +17,6 @@ jobs:
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.event.pull_request.head.ref }}
-          # Secret to be added in the repo under Settings > Secrets > Dependabot
-          token: ${{ secrets.PRBOT_PAT }}
       - uses: actions/setup-go@v5
         with:
           go-version: "1.23"

.github/workflows/misspell.yml

@@ -5,6 +5,10 @@ on:
   schedule:
     - cron: "0 12 * * *"
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -19,7 +23,6 @@ jobs:
       - uses: peter-evans/create-pull-request@v7
         if: github.event_name != 'pull_request'
         with:
-          token: ${{ secrets.PRBOT_PAT }}
           commit-message: "chore: spelling errors fixes"
           title: "chore: fix spelling errors"
           branch: "bot/fix-typos"

.github/workflows/test.yml

@@ -7,7 +7,8 @@ on:
       - main
 
 permissions:
-  contents: read
+  contents: write
+  pull-requests: write
 
 concurrency:
   group: ci-${{ github.ref }}-tests

CODE_OF_CONDUCT.md

@@ -2,7 +2,7 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
 
 ## Our Standards
 
@@ -30,7 +30,7 @@ Project maintainers have the right and responsibility to remove, edit, or reject
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all project spaces, and it also applies when an individual is representing the project or its community in public spaces. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
 
 ## Enforcement
 
@@ -40,7 +40,8 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4/code-of-conduct][version]
+For answers to common questions about this code of conduct, see https://contributor-covenant.org/faq
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/4/code-of-conduct/

UPGRADING.md

@@ -5,7 +5,7 @@ Note, always read the **SimApp** section for more information on application wir
 
 ## [Unreleased]
 
-### BaseApp
+<!-- ### BaseApp
 
 #### Nested Messages Simulation
 
@@ -42,7 +42,7 @@ app.App = appBuilder.Build(db, traceStore, baseAppOptions...)
 To be able to simulate nested messages within a transaction, message types containing nested messages must implement the
 `HasNestedMsgs` interface. This interface requires a single method: `GetMsgs() ([]sdk.Msg, error)`, which should return
 the nested messages. By implementing this interface, the BaseApp can simulate these nested messages during
-transaction simulation. 
+transaction simulation. -->
 
 ## [v0.52.x](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.52.0-beta.1)
 
@@ -977,8 +977,8 @@ To migrate to the `BaseAccount` in `x/accounts`, follow these steps:
 
 1. Send a `basev1.MsgInit` message.
 2. This process allows you to:
-    - Switch to a new public key
-    - Reset your sequence number
+    * Switch to a new public key
+    * Reset your sequence number
 
 > **Important**: If you intend to keep the same public key, ensure you use your current sequence number.
 
@@ -1003,12 +1003,12 @@ Here's an example of the `x/auth.MsgMigrateAccount` message structure:
 
 **Field Descriptions**
 
-- `signer`: The address of the account you want to migrate from.
-- `account_type`: The new account type you want to migrate to (depends on what's installed on the chain).
-- `account_init_msg`: The custom initialization message for the new account.
-    - `@type`: Specifies the type of account (in this case, x/accounts base account).
-    - `pub_key`: The public key for the account. You can migrate to a different public key if desired.
-    - `init_sequence`: The new sequence number for the account.
+* `signer`: The address of the account you want to migrate from.
+* `account_type`: The new account type you want to migrate to (depends on what's installed on the chain).
+* `account_init_msg`: The custom initialization message for the new account.
+    * `@type`: Specifies the type of account (in this case, x/accounts base account).
+    * `pub_key`: The public key for the account. You can migrate to a different public key if desired.
+    * `init_sequence`: The new sequence number for the account.
 
 > **Warning**: If you're keeping the same public key, make sure to use your current sequence number to prevent potential replay attacks.