diff --git a/_data/community_tracers_instrumentation.yml b/_data/community_tracers_instrumentation.yml
index 4b251f5..c3fa011 100644
--- a/_data/community_tracers_instrumentation.yml
+++ b/_data/community_tracers_instrumentation.yml
@@ -328,7 +328,6 @@
   sampling: "Yes"
   notes: A Zipkin integration for Symfony applications
 
-<<<<<<< HEAD
 - language: PHP
   library: >-
     [zipkin-instrumentation-doctrine](https://github.com/jcchavezs/zipkin-instrumentation-doctrine)