From 480e0c7f30ae70ec3bc07f9e7bc57c25610f7d67 Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Tue, 6 Sep 2022 10:45:34 -0400
Subject: [PATCH] fix merge conflict

---
 go.mod | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/go.mod b/go.mod
index 4336fcbf3..8b9ab1f6e 100644
--- a/go.mod
+++ b/go.mod
@@ -9,14 +9,9 @@ require (
 	github.com/adlio/schema v1.3.3
 	github.com/btcsuite/btcd v0.22.1
 	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
-<<<<<<< HEAD
-	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
-=======
 	github.com/bufbuild/buf v1.7.0
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
-	github.com/cosmos/gogoproto v1.4.1
 	github.com/creachadair/taskgroup v0.3.2
->>>>>>> 1067ba157 (add separated runs by UUID (#9367))
 	github.com/fortytw2/leaktest v1.3.0
 	github.com/go-kit/kit v0.12.0
 	github.com/go-kit/log v0.2.1
@@ -39,15 +34,12 @@ require (
 	github.com/spf13/cobra v1.5.0
 	github.com/spf13/viper v1.12.0
 	github.com/stretchr/testify v1.8.0
-<<<<<<< HEAD
-=======
 	github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca
 )
 
 require (
 	github.com/gofrs/uuid v4.2.0+incompatible
 	github.com/google/uuid v1.3.0
->>>>>>> 1067ba157 (add separated runs by UUID (#9367))
 	github.com/tendermint/tm-db v0.6.6
 	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
 	golang.org/x/net v0.0.0-20220726230323-06994584191e
@@ -55,16 +47,14 @@ require (
 )
 
 require (
-	github.com/bufbuild/buf v1.7.0
-	github.com/creachadair/taskgroup v0.3.2
 	github.com/golangci/golangci-lint v1.49.0
 	github.com/prometheus/common v0.34.0 // indirect
-	github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca
 	github.com/vektra/mockery/v2 v2.14.0
 )
 
 require (
 	github.com/informalsystems/tm-load-test v1.0.0
+	gonum.org/v1/gonum v0.11.0
 	google.golang.org/protobuf v1.28.1
 )
 
@@ -134,11 +124,6 @@ require (
 	github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
-<<<<<<< HEAD
-	github.com/gofrs/uuid v4.2.0+incompatible // indirect
-=======
-	github.com/gogo/protobuf v1.3.2 // indirect
->>>>>>> 1067ba157 (add separated runs by UUID (#9367))
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.3 // indirect
 	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
@@ -276,7 +261,6 @@ require (
 	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/tools v0.1.12 // indirect
-	gonum.org/v1/gonum v0.11.0 // indirect
 	google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b // indirect
 	gopkg.in/ini.v1 v1.66.6 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect