fixing merge-conflict
fixing merge-conflict

ewels/NGI-RNAseq,SciLifeLab/NGI-RNAseq,SciLifeLab/NGI-RNAseq,Hammarn/NGI-RNAseq,SciLifeLab/NGI-RNAseq,ewels/NGI-RNAseq,Hammarn/NGI-RNAseq,Hammarn/NGI-RNAseq,ewels/NGI-RNAseq,ewels/NGI-RNAseq,ewels/NGI-RNAseq,Hammarn/NGI-RNAseq,SciLifeLab/NGI-RNAseq,SciLifeLab/NGI-RNAseq,Hammarn/NGI-RNAseq