Added support for merging fastq files
Merged conlficts