diff --git a/deploy/local/docker-compose/vector-kafka-clickhouse.yaml b/deploy/local/docker-compose/vector-kafka-clickhouse.yaml
index 703403c3..adc28f11 100644
--- a/deploy/local/docker-compose/vector-kafka-clickhouse.yaml
+++ b/deploy/local/docker-compose/vector-kafka-clickhouse.yaml
@@ -3608,7 +3608,6 @@ sinks:
     healthcheck:
       enabled: true
     skip_unknown_fields: false
-<<<<<<< HEAD
   libp2p_trace_gossipsub_beacon_block_clickhouse:
     type: clickhouse
     inputs:
@@ -3629,5 +3628,3 @@ sinks:
     healthcheck:
       enabled: true
     skip_unknown_fields: false
-=======
->>>>>>> master