From 24b007545079ebce118185ad1703c856e3068641 Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Tue, 18 Jan 2022 20:04:58 -0500
Subject: [PATCH] fix merge conflicts

---
 internal/consensus/state.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/internal/consensus/state.go b/internal/consensus/state.go
index 96e8b5e95..f87455bb9 100644
--- a/internal/consensus/state.go
+++ b/internal/consensus/state.go
@@ -8,11 +8,7 @@ import (
 	"io/ioutil"
 	"os"
 	"runtime/debug"
-<<<<<<< HEAD
-=======
 	"sort"
-	"sync"
->>>>>>> 0c82ceaa5 (consensus: calculate prevote message delay metric (#7551))
 	"time"
 
 	"github.com/gogo/protobuf/proto"