Solve merge conflict

results/.gitignore

+*

src/.conda_envs/.conda_envs_dir_test

+/Xnfs/lbmcdb/common/conda/envs/.conda_envs_dir_test
\ No newline at end of file

src/.conda_envs/Python_2.7.13

+/Xnfs/lbmcdb/common/conda/envs/Python_2.7.13
\ No newline at end of file

src/.conda_envs/Python_3.6.1

+/Xnfs/lbmcdb/common/conda/envs/Python_3.6.1
\ No newline at end of file

src/.conda_envs/R_3.3.1

+/Xnfs/lbmcdb/common/conda/envs/R_3.3.1
\ No newline at end of file

src/.conda_envs/R_3.4.3

+/Xnfs/lbmcdb/common/conda/envs/R_3.4.3
\ No newline at end of file

src/.conda_envs/axtchain_377

+/Xnfs/lbmcdb/common/conda/envs/axtchain_377
\ No newline at end of file

src/.conda_envs/bcftools_1.7

+/Xnfs/lbmcdb/common/conda/envs/bcftools_1.7
\ No newline at end of file

src/.conda_envs/bedtools_2.25.0

+/Xnfs/lbmcdb/common/conda/envs/bedtools_2.25.0
\ No newline at end of file

src/.conda_envs/bioawk_1.0

+/Xnfs/lbmcdb/common/conda/envs/bioawk_1.0
\ No newline at end of file

src/.conda_envs/biopython_1.74

+/Xnfs/lbmcdb/common/conda/envs/biopython_1.74
\ No newline at end of file

src/.conda_envs/bowtie2_2.3.2

+/Xnfs/lbmcdb/common/conda/envs/bowtie2_2.3.2
\ No newline at end of file

src/.conda_envs/bowtie2_2.3.4.1

+/Xnfs/lbmcdb/common/conda/envs/bowtie2_2.3.4.1
\ No newline at end of file

src/.conda_envs/canu_1.7

+/Xnfs/lbmcdb/common/conda/envs/canu_1.7
\ No newline at end of file

src/.conda_envs/cdhit_4.6.8

+/Xnfs/lbmcdb/common/conda/envs/cdhit_4.6.8
\ No newline at end of file

src/.conda_envs/cutadapt_1.14

+/Xnfs/lbmcdb/common/conda/envs/cutadapt_1.14
\ No newline at end of file

src/.conda_envs/cutadapt_2.4

+/Xnfs/lbmcdb/common/conda/envs/cutadapt_2.4
\ No newline at end of file

src/.conda_envs/deeptools_3.0.2

+/Xnfs/lbmcdb/common/conda/envs/deeptools_3.0.2
\ No newline at end of file

src/.conda_envs/envs

+/Xnfs/lbmcdb/common/conda/envs/
\ No newline at end of file

src/.conda_envs/fastp_0.19.7

+/Xnfs/lbmcdb/common/conda/envs/fastp_0.19.7
\ No newline at end of file