Merge branch 'main' into dev

content/3.defense-systems/bsta.md

@@ -9,7 +9,7 @@ tableColumns:
     Sensor: Unknown
     Activator: Unknown
     Effector: Unknown
-    PFAM: 
+    PFAM: ""
 contributors: 
     - Rachel Lavenir
 relevantAbstracts:

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