Solve merge conflict

src/.conda_envs/fastqc_0.11.5

src/.conda_envs/flexi-splitter_1.0.0

src/.conda_envs/gatk_3.8

src/.conda_envs/hisat2_2.0.0

src/.conda_envs/hisat2_2.1.0

src/.conda_envs/htseq_0.11.2

src/.conda_envs/htseq_0.9.1

src/.conda_envs/kallisto_0.43.1

src/.conda_envs/kallisto_0.44.0

src/.conda_envs/liftover_357

src/.conda_envs/macs2_2.1.2

src/.conda_envs/multiqc_0.9

src/.conda_envs/multiqc_1.0

src/.conda_envs/multiqc_1.7

src/.conda_envs/music_1.0.0

src/.conda_envs/nextflow_0.25.1

src/.conda_envs/nextflow_0.28.2

src/.conda_envs/nextflow_0.32.0

src/.conda_envs/nextflow_19.01.0

src/.conda_envs/picard_2.18.11