diff --git a/test/test_unit/test_prepare/test_download.py b/test/test_unit/test_prepare/test_download.py
index 82131b56b7b224ff706e52e9dd91637577115c42..3537355a83f762d17635ee7ebfb56621183a9605 100755
--- a/test/test_unit/test_prepare/test_download.py
+++ b/test/test_unit/test_prepare/test_download.py
@@ -693,15 +693,10 @@ def test_download_2taxid(caplog):
 def test_download_refseq_vs_genbank(caplog):
     """
     Give a taxid of a subspecies, download strains from refseq, and then from genbank.
-    Currently, no strains in refseq, and 2 in genbank.
-<<<<<<< HEAD
-    39831 = Klebsiella pneumoniae subsp. rhinoscleromatis
-    (60 = Vitreoscilla sp.)
-=======
-    urrently, no strains in refseq, and 8 in genbank.
+
+    Currently, no strains in refseq, and 8 in genbank.
     #39831 = Klebsiella pneumoniae subsp. rhinoscleromatis
     60 = Vitreoscilla sp.
->>>>>>> 0896f49 (change taxid to compare refseq vs genbank)
     Later, there can be some in refseq, but always at least 2 more in genbank
     """
     caplog.set_level(logging.INFO)