adding in the genome_region_map
fixing conflicts