fix conflicts

CHANGELOG.md

@@ -5,29 +5,7 @@
 ### Improvements
 
 - [#726](https://github.com/cosmos/iavl/pull/726) Make `KVPair` and `ChangeSet` serializable with protobuf.
-<<<<<<< HEAD
-=======
-- [#718](https://github.com/cosmos/iavl/pull/718) Fix `traverseNodes` unexpected behaviour
-- [#770](https://github.com/cosmos/iavl/pull/770) Add `WorkingVersion()int64` API.
-
-### Bug Fixes
-
-- [#773](https://github.com/cosmos/iavl/pull/773) Fix memory leak in `Import`.
-- [#795](https://github.com/cosmos/iavl/pull/795) Fix plugin used for buf generate.
-
-### Breaking Changes
-
-- [#735](https://github.com/cosmos/iavl/pull/735) Pass logger to `NodeDB`, `MutableTree` and `ImmutableTree`
-
-- [#646](https://github.com/cosmos/iavl/pull/646) Remove the `orphans` from the storage
-
-- [#777](https://github.com/cosmos/iavl/pull/777) Don't return errors from ImmutableTree.Hash, NewImmutableTree, NewImmutableTreeWIthOpts
-
-### API Changes
-
-- [#646](https://github.com/cosmos/iavl/pull/646) Remove the `DeleteVersion`, `DeleteVersions`, `DeleteVersionsRange` and introduce a new endpoint of `DeleteVersionsTo` instead
-- [#695](https://github.com/cosmos/iavl/pull/695) Add API `SaveChangeSet` to save the changeset as a new version.
->>>>>>> d6844ac (fix: use gogofaster plugin (#795))
+- [#795](https://github.com/cosmos/iavl/pull/795) Use gogofaster buf plugin.
 
 ## 0.20.0 (March 14, 2023)