--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/tmp/TEST_1.gbff	Thu Dec 22 15:01:43 2022 +0000
@@ -0,0 +1,107 @@
+<<<<<<< HEAD:tools/bakta/test-data/TEST_1/TEST_1.gbff
+LOCUS       contig_1                1330 bp    DNA     circular BCT 19-DEC-2022
+=======
+<<<<<<< HEAD:tools/bakta/test-data/TEST_4/TEST_4.gbff
+LOCUS       p2                      1330 bp    DNA     circular BCT 16-SEP-2022
+DEFINITION  plasmid pOSAK1, complete sequence.
+ACCESSION   p2
+VERSION     p2
+=======
+LOCUS       contig_1                1330 bp    DNA     circular BCT 21-DEC-2022
+>>>>>>> 17d4de2b8 (update bakta for plot output and to reduce number of output files):tools/bakta/test-data/tmp/TEST_1.gbff
+DEFINITION  plasmid unnamed1, complete sequence.
+ACCESSION   contig_1
+VERSION     contig_1
+>>>>>>> f1bb03fb2 (update bakta for plot output and to reduce number of output files):tools/bakta/test-data/tmp/TEST_1.gbff
+KEYWORDS    .
+SOURCE      None
+  ORGANISM  .
+            .
+COMMENT     Annotated with Bakta
+            Software: v1.6.1
+            Database: v4.0
+            DOI: 10.1099/mgen.0.000685
+            URL: github.com/oschwengers/bakta
+            
+            ##Genome Annotation Summary:##
+<<<<<<< HEAD:tools/bakta/test-data/tmp/TEST_1.gbff
+<<<<<<< HEAD:tools/bakta/test-data/TEST_1/TEST_1.gbff
+            Annotation Date                :: 12/19/2022, 10:20:25
+=======
+<<<<<<< HEAD:tools/bakta/test-data/TEST_4/TEST_4.gbff
+            Annotation Date                :: 09/16/2022, 07:32:50
+=======
+            Annotation Date                :: 12/21/2022, 14:34:39
+>>>>>>> f1bb03fb2 (update bakta for plot output and to reduce number of output files):tools/bakta/test-data/tmp/TEST_1.gbff
+>>>>>>> 17d4de2b8 (update bakta for plot output and to reduce number of output files):tools/bakta/test-data/tmp/TEST_1.gbff
+=======
+            Annotation Date                :: 12/21/2022, 19:53:31
+>>>>>>> 195c8410c (change option for plot):tools/bakta/test-data/TEST_1/TEST_1.gbff
+            Annotation Pipeline            :: Bakta
+            Annotation Software version    ::  v1.6.1
+            Annotation Database version    ::  v4.0
+            CDSs                           ::     2
+            tRNAs                          ::     0
+            tmRNAs                         ::     0
+            rRNAs                          ::     0
+            ncRNAs                         ::     0
+            regulatory ncRNAs              ::     0
+            CRISPR Arrays                  ::     0
+            oriCs/oriVs                    ::     0
+            oriTs                          ::     0
+            gaps                           ::     0
+            pseudogenes                    ::     0
+FEATURES             Location/Qualifiers
+     source          1..1330
+                     /mol_type="genomic DNA"
+                     /plasmid="unnamed1"
+     gene            413..736
+                     /locus_tag="IHHALP_00005"
+     CDS             413..736
+                     /product="hypothetical protein"
+                     /locus_tag="IHHALP_00005"
+                     /protein_id="gnl|Bakta|IHHALP_00005"
+                     /translation="MTKRSGSNTRRRAISRPVRLTAEEDQEIRKRAAECGKTVSGFLRA
+                     AALGKKVNSLTDDRVLKEVMRLGALQKKLFIDGKRVGDREYAEVLIAITEYHRALLSRL
+                     MAD"
+                     /codon_start=1
+                     /transl_table=11
+                     /inference="ab initio prediction:Prodigal:2.6"
+     gene            complement(join(971..1330,1..141))
+                     /locus_tag="IHHALP_00010"
+     CDS             complement(join(971..1330,1..141))
+                     /product="hypothetical protein"
+                     /locus_tag="IHHALP_00010"
+                     /protein_id="gnl|Bakta|IHHALP_00010"
+                     /translation="MNKQQQTALNMAGFIKSQSLTLLEKLDALDADEQATMCEKLHELA
+                     EEQIEAIKNKDKTLFIVYATDIYSPSEFFSKIESDLKKKKSKGDVFFDLIIPNGGKKDR
+                     YVYTSFNGEKFSSYTLNKVTKTDEYNDLSELSASFFKKNFDKINVNLLSKATSFALKKG
+                     IPI"
+                     /codon_start=1
+                     /transl_table=11
+                     /inference="ab initio prediction:Prodigal:2.6"
+ORIGIN
+        1 ttcttctgcg agttcgtgca gcttctcaca catggtggcc tgctcgtcag catcgagtgc
+       61 gtccagtttt tcgagcagcg tcaggctctg gctttttatg aatcccgcca tgttgagtgc
+      121 agtttgctgc tgcttgttca tctttctgtt ttctccgttc tgtctgtcat ctgcgtcgtg
+      181 tgattatatc gcgcaccact tttcgaccgt cttaccgccg gtattctgcc gacggacatt
+      241 tcagtcagac aacactgtca ctgccaaaaa acagcagtgc tttgttggta attcgaactt
+      301 gcagacagga caggatgtgc aattgttata ccgcgcatac atgcacgcta ttacaattac
+      361 cctggtcagg gcttcgcccc gacaccccat gtcagatacg gagccatgtt ttatgacaaa
+      421 acgaagtgga agtaatacgc gcaggcgggc tatcagtcgc cctgttcgtc tgacggcaga
+      481 agaagaccag gaaatcagaa aaagggctgc tgaatgcggc aagaccgttt ctggtttttt
+      541 acgggcggca gctctcggta agaaagttaa ctcactgact gatgaccggg tgctgaaaga
+      601 agttatgcga ctgggggcgt tgcagaaaaa actctttatc gacggcaagc gtgtcgggga
+      661 cagagagtat gcggaggtgc tgatcgctat tacggagtat caccgtgccc tgttatccag
+      721 gcttatggca gattagcttc ccggagagaa actgtcgaaa acagacggta tgaacgccgt
+      781 aagcccccaa accgatcgcc attcactttc atgcatagct atgcagtgag ctgaaagcga
+      841 tcctgacgca tttttccggt ttaccccggg gaaaacatct ctttttgcgg tgtctgcgtc
+      901 agaatcgcgt tcagcgcgtt ttggcggtgc gcgtaatgag acgttatggt aaatgtcttc
+      961 tggcttgata ttatattgga atgccttttt tcaaagcaaa tgatgtggct ttggatagaa
+     1021 ggtttacgtt gatcttatca aagttttttt taaagaacga agccgagagc tcagataaat
+     1081 cattatattc atcagttttc gtaactttgt ttaatgtgta acttgaaaac ttctcgccat
+     1141 taaatgacgt atagacgtaa cgatcttttt ttccaccgtt aggaattatt aaatcaaaaa
+     1201 aaacatcacc cttgcttttc tttttcttca agtcggattc gatttttgag aaaaattcgc
+     1261 tcgggctata aatatcagta gcatagacaa taaataaagt tttatcttta ttttttattg
+     1321 cttctatttg
+//