diff --git a/tests/test_pyi25.py b/tests/test_pyi25.py
index b7367069..7a8d7d20 100644
--- a/tests/test_pyi25.py
+++ b/tests/test_pyi25.py
@@ -139,7 +139,4 @@ def test_main_with_noverificador():
     with open("prueba-cae-i25.png", "rb") as f:
         content = f.read()
     assert len(content) > 0
-<<<<<<< HEAD
-=======
     
->>>>>>> 6922dcc (test_pyi25.py : added tests to increase coverage from 81% to 86%)