diff --git a/NAMESPACE b/NAMESPACE
index f74625ef..6a63a4b3 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -41,16 +41,10 @@ export(create_lineage_lookup)
 export(create_one_col_params)
 export(domain_network)
 export(efetch_ipg)
-<<<<<<< HEAD
-export(filterByDomains)
-export(filterByFrequency)
-export(findParalogs)
-=======
 export(extractAccNum)
 export(filter_by_doms)
 export(filter_freq)
 export(find_paralogs)
->>>>>>> main
 export(find_top_acc)
 export(format_job_args)
 export(gc_undirected_network)
@@ -94,22 +88,12 @@ export(send_job_status_email)
 export(shorten_lineage)
 export(sink.reset)
 export(stacked_lin_plot)
-<<<<<<< HEAD
-export(string2accnum)
-export(summarizeByLineage)
-export(summarizeDomArch)
-export(summarizeDomArch_ByLineage)
-export(summarizeGenContext)
-export(summarizeGenContext_ByDomArchLineage)
-export(summarizeGenContext_ByLineage)
-=======
 export(summ.DA)
 export(summ.DA.byLin)
 export(summ.GC)
 export(summ.GC.byDALin)
 export(summ.GC.byLin)
 export(summarize_bylin)
->>>>>>> main
 export(theme_genes2)
 export(to_titlecase)
 export(totalGenContextOrDomArchCounts)