diff --git a/build.xml b/build.xml
index 8ae42b80e6..df6d46914b 100644
--- a/build.xml
+++ b/build.xml
@@ -1492,11 +1492,7 @@
   </target>
 
   <target name="test-all" 
-<<<<<<< HEAD
           depends="eclipse-warnings,test,long-test,test-compression,stress-test"
-=======
-          depends="eclipse-warnings,test,long-test,test-compression" 
->>>>>>> cassandra-3.9
           description="Run all tests except for those under test-burn" />
   
   <!-- Use JaCoCo ant extension without needing externally saved lib -->