resolve conflicts

CHANGELOG.md

@@ -38,23 +38,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
-<<<<<<< HEAD
 * [\#9428](https://github.com/cosmos/cosmos-sdk/pull/9428) Optimize bank InitGenesis. Added `k.initBalances`.
-=======
-* [\#8077](https://github.com/cosmos/cosmos-sdk/pull/8077) Added support for grpc-web, enabling browsers to communicate with a chain's gRPC server
-* [\#8965](https://github.com/cosmos/cosmos-sdk/pull/8965) cosmos reflection now provides more information on the application such as: deliverable msgs, sdk.Config info etc (still in alpha stage).
-* [\#8559](https://github.com/cosmos/cosmos-sdk/pull/8559) Added Protobuf compatible secp256r1 ECDSA signatures.
-* [\#8786](https://github.com/cosmos/cosmos-sdk/pull/8786) Enabled secp256r1 in x/auth.
-* (rosetta) [\#8729](https://github.com/cosmos/cosmos-sdk/pull/8729) Data API fully supports balance tracking. Construction API can now construct any message supported by the application.
-* [\#8754](https://github.com/cosmos/cosmos-sdk/pull/8875) Added support for reverse iteration to pagination.
-* [#9088](https://github.com/cosmos/cosmos-sdk/pull/9088) Added implementation to ADR-28 Derived Addresses.
-* [\#9133](https://github.com/cosmos/cosmos-sdk/pull/9133) Added hooks for governance actions.
-* (x/staking) [\#9214](https://github.com/cosmos/cosmos-sdk/pull/9214) Added `new_shares` attribute inside `EventTypeDelegate` event.
-* [\#9382](https://github.com/cosmos/cosmos-sdk/pull/9382) feat: add Dec.Float64() function.
 * [\#9429](https://github.com/cosmos/cosmos-sdk/pull/9429) Add `cosmos_sdk_version` to node_info
-* [\#9457](https://github.com/cosmos/cosmos-sdk/pull/9457) Add amino support for x/authz and x/feegrant Msgs.
-* [\#9498](https://github.com/cosmos/cosmos-sdk/pull/9498) Added `Codec: codec.Codec` attribute to `client/Context` structure.
->>>>>>> 105ad99a8 (feat: add cosmos-sdk Version (#9429))
 
 ### Bug Fixes
 

CONTRIBUTING.md

@@ -73,7 +73,6 @@ of how these are written refer to [Tendermint ADRs](https://github.com/tendermin
 
 ## Pull Requests
 
-<<<<<<< HEAD
 To accommodate review process we suggest that PRs are categorically broken up.
 Ideally each PR addresses only a single issue. Additionally, as much as possible
 code refactoring and cleanup should be submitted as a separate PRs from bugfixes/feature-additions.
@@ -90,44 +89,6 @@ All PRs require two Reviews before merge (except docs changes, or variable name-
   - Naming must be consistent with conventions and the rest of the codebase
   - Code must live in a reasonable location, considering dependency structures (e.g. not importing testing modules in production code, or including example code modules in production code).
   - if you approve of the PR, you are responsible for fixing any of the issues mentioned here and more
-=======
-PRs should be categorically broken up based on the type of changes being made (i.e. `fix`, `feat`,
-`refactor`, `docs`, etc.). The *type* must be included in the PR title as a prefix (e.g.
-`fix: <description>`). This ensures that all changes committed to the base branch follow the
-[Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) specification.
-Additionally, each PR should only address a single issue.
-
-### Pull Request Templates
-
-There are currently three PR templates. The [default template](./.github/PULL_REQUEST_TEMPLATE.md) is for types `fix`, `feat`, and `refactor`. We also have a [docs template](./.github/PULL_REQUEST_TEMPLATE/docs.md) for documentation changes and an [other template](./.github/PULL_REQUEST_TEMPLATE/other.md) for changes that do not affect production code. When previewing a PR before it has been opened, you can change the template by adding one of the following parameters to the url:
-
-- `template=docs.md`
-- `template=other.md`
-
-### Requesting Reviews
-
-In order to accomodate the review process, the author of the PR must complete the author checklist
-to the best of their abilities before marking the PR as "Ready for Review". If you would like to
-receive early feedback on the PR, open the PR as a "Draft" and leave a comment in the PR indicating
-that you would like early feedback and tagging whoever you would like to receive feedback from.
-
-### Reviewing Pull Requests
-
-All PRs require at least two reviews before they can be merged (one review might be acceptable in
-the case of minor changes to [docs](./.github/PULL_REQUEST_TEMPLATE/docs.md) or [other](./.github/PULL_REQUEST_TEMPLATE/other.md) changes that do not affect production code). Each PR template has a
-reviewers checklist that must be completed before the PR can be merged. Each reviewer is responsible
-for all checked items unless they have indicated otherwise by leaving their handle next to specific
-items. In addition, please use the following review explanations:
-
-- `LGTM` without an explicit approval means that the changes look good, but you haven't thoroughly reviewed the reviewer checklist items.
-- `Approval` means that you have completed some or all of the reviewer checklist items. If you only reviewed selected items, you have added your handle next to the items that you have reviewed. In addition, please follow these guidelines:
-    - You must also think through anything which ought to be included but is not
-    - You must think through whether any added code could be partially combined (DRYed) with existing code
-    - You must think through any potential security issues or incentive-compatibility flaws introduced by the changes
-    - Naming must be consistent with conventions and the rest of the codebase
-    - Code must live in a reasonable location, considering dependency structures (e.g. not importing testing modules in production code, or including example code modules in production code).
-    - If you approve of the PR, you are responsible for any issues mentioned here and any issues that should have been addressed after thoroughly reviewing the reviewer checklist items in the pull request template.
->>>>>>> 105ad99a8 (feat: add cosmos-sdk Version (#9429))
 - If you sat down with the PR submitter and did a pairing review please note that in the `Approval`, or your PR comments.
 - If you are only making "surface level" reviews, submit any notes as `Comments` without adding a review.