diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml b/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml
index 9075a16ae..71243c5f4 100644
--- a/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml
+++ b/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml
@@ -30,7 +30,6 @@
     <artifactId>collector-agent-stream</artifactId>
     <packaging>jar</packaging>
 
-<<<<<<< HEAD
     <dependencies>
         <dependency>
             <groupId>org.skywalking</groupId>
@@ -39,7 +38,3 @@
         </dependency>
     </dependencies>
 </project>
-=======
-
-</project>
->>>>>>> 406c4f52d8251eb81aa868ec38f17789e18e0dc0