merge
MAINT: reflect changes to parse_fastq