Fix merge conflicts

.editorconfig

.github/PULL_REQUEST_TEMPLATE.md

.github/workflows/awsfulltest.yml

.github/workflows/ci.yml

.github/workflows/linting.yml

.nf-core.yml

CHANGELOG.md

CITATIONS.md

CODE_OF_CONDUCT.md

README.md

assets/bamtools_filter_pe.json

assets/bamtools_filter_se.json

assets/blacklists/v1.0/GRCh37-blacklist.v1.bed

assets/blacklists/v1.0/hg19-blacklist.v1.bed

assets/blacklists/v2.0/GRCm38-blacklist.v2.bed

assets/blacklists/v2.0/ce10-blacklist.v2.bed

assets/blacklists/v2.0/ce11-blacklist.v2.bed

assets/blacklists/v2.0/dm3-blacklist.v2.bed

assets/blacklists/v2.0/dm6-blacklist.v2.bed

assets/blacklists/v2.0/hg19-blacklist.v2.bed