Changed fasta header handling for Prokka input in merge
Added header override flags for merge