Added in removing wrong diagonal combos
Fixed conflicts in fasta.cpp