diff --git a/workflow/tests/test_xcor.py b/workflow/tests/test_xcor.py
index e00f4f451ca5cefb786a6952abd54d7bf21f5805..69006a0f03f4193035898e14376f01be463e3089 100644
--- a/workflow/tests/test_xcor.py
+++ b/workflow/tests/test_xcor.py
@@ -9,7 +9,6 @@ test_output_path = os.path.dirname(os.path.abspath(__file__)) + \
 
 
 @pytest.mark.singleend
-<<<<<<< HEAD
 def test_cross_singleend():
     assert os.path.exists(os.path.join(test_output_path, 'ENCFF833BLU.cc.plot.pdf'))
     qc_file = os.path.join(test_output_path,"ENCFF833BLU.cc.qc")