Resolve conflicts in conda with priority to conda-forge#282

TomKellyGenetics wants to merge 4 commits intoENCODE-DCC:masterENCODE-DCC/atac-seq-pipeline:masterfrom

TomKellyGenetics:patch-1TomKellyGenetics/atac-seq-pipeline:patch-1Copy head branch name to clipboard