diff --git a/nflist b/nflist
index 5dbbdf9..7c2f9bd 100755
--- a/nflist
+++ b/nflist
@@ -7,10 +7,7 @@
  Px437_Kaypro2k NF:style=Regular:pixelsize=16:antialias=true
  Topaza500a1000a2000 NF:pixelsize=16:antialias=true
  Topaza600a1200a400 NF:pixelsize=16:antialias=true
-<<<<<<< HEAD
  Topaza600a1200a400 NF:style=Book:pixelsize=16:antialias=true
-=======
->>>>>>> 0581c3b444709103759b6b3c6242c3052345a931
  Px437_CompaqThin_8x14 NF:style=Thin\_8x14NerdFontCo:pixelsize=16:antialias=true
  Px437_CompaqThin_8x16 NF:style=Thin\_8x16NerdFontCo:pixelsize=16:antialias=true
  Px437_CompaqThin_8x8 NF:style=Thin\_8x8NerdFontCom:pixelsize=16:antialias=true
@@ -46,18 +43,12 @@
  Px437_ATT_PC6300 NF:style=Book:pixelsize=16:antialias=true
  Px437_DTK_BIOS NF:style=Book:pixelsize=16:antialias=true
  Px437_IBM_3270pc NF:style=Book:pixelsize=16:antialias=true
-<<<<<<< HEAD
  Px437_IBM_BIOS NF:style=2y:pixelsize=16:antialias=true
-=======
->>>>>>> 0581c3b444709103759b6b3c6242c3052345a931
  Px437_IBM_BIOS NF:style=Book:pixelsize=16:antialias=true
  Px437_IBM_CGA NF:style=Book:pixelsize=16:antialias=true
-<<<<<<< HEAD
  Px437_IBM_CGAthin NF:style=2y:pixelsize=16:antialias=true
  Px437_IBM_CGAthin NF:style=Medium:pixelsize=16:antialias=true
  Px437_IBM_Conv NF:style=2y:pixelsize=16:antialias=true
-=======
->>>>>>> 0581c3b444709103759b6b3c6242c3052345a931
  Px437_IBM_Conv NF:style=Book:pixelsize=16:antialias=true
  Px437_IBM_EGA8 NF:style=Book:pixelsize=16:antialias=true
  Px437_IBM_EGA9 NF:style=Book:pixelsize=16:antialias=true
@@ -91,7 +82,6 @@
  Px437_Wyse700a NF:style=Book:pixelsize=16:antialias=true
  Px437_Wyse700b NF:style=Book:pixelsize=16:antialias=true
  Topaza500a1000a2000 NF:style=Book:pixelsize=16:antialias=true
-<<<<<<< HEAD
  MicroKnight NF:pixelsize=16:antialias=true
  MicroKnight NF:style=Book:pixelsize=16:antialias=true
  MicroKnight NF:style=PlusFontAwesomeMon:pixelsize=16:antialias=true
@@ -143,6 +133,4 @@
  Px437_IBM_PGC NF:style=2x:pixelsize=16:antialias=true
  Px437_IBM_VGA8 NF:style=2x:pixelsize=16:antialias=true
  Px437_IBM_VGA9 NF:style=2x:pixelsize=16:antialias=true
-=======
  Topaza600a1200a400 NF:style=Book:pixelsize=16:antialias=true
->>>>>>> 0581c3b444709103759b6b3c6242c3052345a931