diff --git a/misc-scripts/xref_mapping/sql/populate_metadata.sql b/misc-scripts/xref_mapping/sql/populate_metadata.sql
index 559614f744e091682cb7d58f6999f922d1463273..c1c4f64de65704330e90cecc478151520bc66ed8 100644
--- a/misc-scripts/xref_mapping/sql/populate_metadata.sql
+++ b/misc-scripts/xref_mapping/sql/populate_metadata.sql
@@ -804,26 +804,12 @@ INSERT INTO source_url (source_id, species_id, url, file_modified_date, upload_d
 # GO
 INSERT INTO source_url (source_id, species_id, url, file_modified_date, upload_date, parser) VALUES (1070, 7165,'ftp://ftp.ebi.ac.uk/pub/databases/GO/goa/UNIPROT/gene_association.goa_uniprot.gz', now(), now(), "GOParser");
 
-<<<<<<< populate_metadata.sql
 # VectorBase Arrays
 INSERT INTO source_url (source_id, species_id, url, file_modified_date, upload_date, parser) VALUES (2857, 7165,'LOCAL:Anopheles_gambiae/IC/IC_MMC1_20k_v1.txt', now(), now(), "VbDirectParser");
 INSERT INTO source_url (source_id, species_id, url, file_modified_date, upload_date, parser) VALUES (2858, 7165,'LOCAL:Anopheles_gambiae/IC/IC_MMC2_12k_v1.txt', now(), now(), "VbDirectParser");
 INSERT INTO source_url (source_id, species_id, url, file_modified_date, upload_date, parser) VALUES (2859, 7165,'LOCAL:Anopheles_gambiae/JHU/JHU_GAM3.0_21k_v1.txt', now(), now(), "VbDirectParser");
 INSERT INTO source_url (source_id, species_id, url, file_modified_date, upload_date, parser) VALUES (2860, 7165,'LOCAL:Anopheles_gambiae/LIV/LIV_GAMDETOX_0.25k_v1.txt', now(), now(), "VbDirectParser");
 
-
-=======
-# VectorBase Arrays
-INSERT INTO source_url (source_id, species_id, url, file_modified_date, upload_date, parser) VALUES (2857, 7165,'LOCAL:Anopheles_gambiae/IC/IC_MMC1_20k_v1.txt', now(), now(), "VbDirectParser");
-INSERT INTO source_url (source_id, species_id, url, file_modified_date, upload_date, parser) VALUES (2858, 7165,'LOCAL:Anopheles_gambiae/IC/IC_MMC2_12k_v1.txt', now(), now(), "VbDirectParser");
-INSERT INTO source_url (source_id, species_id, url, file_modified_date, upload_date, parser) VALUES (2859, 7165,'LOCAL:Anopheles_gambiae/JHU/JHU_GAM3.0_21k_v1.txt', now(), now(), "VbDirectParser");
-INSERT INTO source_url (source_id, species_id, url, file_modified_date, upload_date, parser) VALUES (2860, 7165,'LOCAL:Anopheles_gambiae/LIV/LIV_GAMDETOX_0.25k_v1.txt', now(), now(), "VbDirectParser");
-
-
->>>>>>> 1.102
-# --------------------------------------------------------------------------------
-
-
 ###### Aedes 
 
 # Uniprot