diff --git a/qubittool/tool.py b/qubittool/tool.py
index 70f2c0f..c608137 100644
--- a/qubittool/tool.py
+++ b/qubittool/tool.py
@@ -11,13 +11,10 @@ from openpyxl.styles import PatternFill, Border, Side, Alignment
 
 from rowmodel import RowModel
 
-<<<<<<< HEAD
 codex:dict = {"cfDNA from Plasma":None}
 codex.update ( {"gDNA from cells":"BM"} )
 codex.update({"gDNA from Buffy Coat":"BC"})
 
-=======
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
 def read_qubit_doc_by_accession(keys:dict, path:str):
     # collect values_by_sample_names string ids #
     with open(path, 'r', newline='', encoding='utf-8') as csvfile: