diff --git a/subscriber.go b/subscriber.go
index e7557b8..c61854a 100644
--- a/subscriber.go
+++ b/subscriber.go
@@ -39,7 +39,6 @@ type consumer struct {
 }
 
 type Subscriber struct {
-<<<<<<< HEAD
 	consumers    map[tp]*consumer
 	c            *kgo.Client
 	htracer      *hookTracer