diff --git a/content/3.defense-systems/bsta.md b/content/3.defense-systems/bsta.md
index 3d7980f4eb0b5da25b7ab21233ac8ab731639c75..dd03995df0f8b66c32cd7d9012e27e1246d801a5 100644
--- a/content/3.defense-systems/bsta.md
+++ b/content/3.defense-systems/bsta.md
@@ -9,7 +9,7 @@ tableColumns:
     Sensor: Unknown
     Activator: Unknown
     Effector: Unknown
-    PFAM: 
+    PFAM: ""
 contributors: 
     - Rachel Lavenir
 relevantAbstracts:
diff --git a/content/3.defense-systems/gaps6.md b/content/3.defense-systems/gaps6.md
index 6e4bdbd3386bbd02b6fcf833a76223d59a79baa6..22188f4cf2ea8e694c8e56ec4372b36c9be6dee3 100644
--- a/content/3.defense-systems/gaps6.md
+++ b/content/3.defense-systems/gaps6.md
@@ -16,7 +16,6 @@ relevantAbstract:
 
 ## Description
 
-<<<<<<< content/3.defense-systems/gaps6.md
 GAPS (GMT-encoded Anti-Phage System) antiphage systems were discovered on newly described Gamma-Mobile-Trio elements. 
 
 GAPS6 is composed of two proteins, [GAPS6a](https://www.ncbi.nlm.nih.gov/protein/WP_248387294.1/) and [GAPS6b](https://www.ncbi.nlm.nih.gov/protein/WP_248387295.1/). These two proteins are encoded together in diverse Gram-negative bacteria.
@@ -91,7 +90,3 @@ end
     style Title3 fill:none,stroke:none,stroke-width:none
     style Title4 fill:none,stroke:none,stroke-width:none
 </mermaid>
-<<<<<<< content/3.defense-systems/gaps6.md
-=======
-
->>>>>>> content/3.defense-systems/gaps6.md