From 3559a525d556e7af05771392520e8a30dd5edb06 Mon Sep 17 00:00:00 2001
From: Ksenia Krasheninnikova <kk16@sanger.ac.uk>
Date: Thu, 15 Aug 2024 16:29:15 +0100
Subject: [PATCH] Merge conflict

---
 subworkflows/local/hic_mapping.nf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subworkflows/local/hic_mapping.nf b/subworkflows/local/hic_mapping.nf
index a4d340c..05104a7 100644
--- a/subworkflows/local/hic_mapping.nf
+++ b/subworkflows/local/hic_mapping.nf
@@ -43,7 +43,7 @@ workflow HIC_MAPPING {
     reference_tuple
         .join( hic_reads_path )
         .map { meta, ref, hic_reads_path ->
-                tuple([ id: meta.id, single_end: true], hic_reads_path, hic_reads_path.collect { p -> p.resolveSibling(p.name + ".crai") } ) }
+                tuple([ id: meta.id, hap_id: hap_id, single_end: true], hic_reads_path, hic_reads_path.collect { p -> p.resolveSibling(p.name + ".crai") } ) }
         .set { get_reads_input }
 
     //