On branch mergify/bp/v0.34.x/pr-9622
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit 09b870831.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   blockchain/msgs.go
	modified:   cmd/tendermint/commands/debug/util.go
	modified:   consensus/byzantine_test.go
	modified:   consensus/invalid_test.go
	modified:   consensus/msgs_test.go
	modified:   consensus/reactor_test.go
	modified:   evidence/reactor.go
	modified:   evidence/reactor_test.go
	modified:   mempool/v0/reactor.go
	modified:   mempool/v0/reactor_test.go
	modified:   mempool/v1/reactor.go
	modified:   p2p/base_reactor.go
	modified:   p2p/conn/connection.go
	modified:   p2p/mock/peer.go
	modified:   p2p/mock/reactor.go
	modified:   p2p/mocks/peer.go
	modified:   p2p/peer.go
	modified:   p2p/peer_set_test.go
	modified:   p2p/peer_test.go
	modified:   p2p/pex/pex_reactor_test.go
	modified:   p2p/switch.go
	modified:   p2p/switch_test.go
	modified:   p2p/test_util.go
	modified:   p2p/transport.go
	modified:   p2p/types.go
	new file:   proto/tendermint/consensus/message.go
	new file:   proto/tendermint/mempool/message.go
	new file:   proto/tendermint/p2p/pex.go
	new file:   proto/tendermint/statesync/message.go
	modified:   statesync/messages.go
	modified:   statesync/messages_test.go
	modified:   statesync/reactor.go
	modified:   statesync/reactor_test.go
	modified:   statesync/syncer.go
	modified:   statesync/syncer_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/lint.yml
	both modified:   blockchain/v0/reactor.go
	both modified:   cmd/tendermint/commands/rollback.go
	both modified:   consensus/msgs.go
	both modified:   consensus/reactor.go
	both modified:   go.mod
	both modified:   go.sum
	both modified:   libs/rand/random.go
	deleted by us:   p2p/metrics.gen.go
	both modified:   p2p/metrics.go
	both modified:   p2p/pex/pex_reactor.go
	added by them:   proto/tendermint/blockchain/message.go