From 369134a840b11e9b2e684e02ffdf9936cc5a1965 Mon Sep 17 00:00:00 2001
From: Stephen Buttolph <stephen@avalabs.org>
Date: Fri, 24 Nov 2023 12:46:48 -0500
Subject: [PATCH] merged

---
 snow/consensus/snowman/metrics.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/snow/consensus/snowman/metrics.go b/snow/consensus/snowman/metrics.go
index aa7a92a57576..1f57354b7cc7 100644
--- a/snow/consensus/snowman/metrics.go
+++ b/snow/consensus/snowman/metrics.go
@@ -48,10 +48,6 @@ type metrics struct {
 	// latAccepted tracks the number of nanoseconds that a block was processing
 	// before being accepted
 	latAccepted          metric.Averager
-<<<<<<< HEAD
-	blockSizeAcceptedSum prometheus.Gauge
-=======
->>>>>>> dev
 	buildLatencyAccepted prometheus.Gauge
 
 	blockSizeRejectedSum prometheus.Gauge