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