diff --git a/src/bolero.nf b/src/bolero.nf
index 308996dbb86eb7249f1d39b27eca0f1b687c5076..0e7e3fa1f410be53b1172ce7118491d028742ee4 100755
--- a/src/bolero.nf
+++ b/src/bolero.nf
@@ -171,10 +171,6 @@ if(!params.skipBC) {
   }
 }
 
-<<<<<<< HEAD
-// include { barecode } from "./nf_modules/barecode/main.nf" 
-=======
->>>>>>> c281bb3789a8d844085e21f749580c29d43b35d6
 include { concatenate } from "./nf_modules/seqkit/main.nf"
 include { cut_5pRACE } from "./nf_modules/cutadapt/main.nf"
 include { hbv_genome } from "./nf_modules/minimap2/main.nf"