check for conflict
Merge branch 'rnaseq' of github.com:clark-lab/ngsane into rnaseq