change contributors and resolve merge

content/3.defense-systems/thoeris.md

@@ -11,7 +11,9 @@ tableColumns:
     Effector: Nucleotide modifying
     PFAM: PF08937, PF13289, PF18185
 contributors: 
-  - Marie Guillaume, Helena Shomar
+  - Marie Guillaume
+  - Helena Shomar
+  - Florian Tesson
 relevantAbstracts:
   - doi: 10.1038/s41586-021-04098-7
   - doi: 10.1126/science.aar4120
@@ -56,7 +58,6 @@ Proportion of genome encoding the Thoeris system for the 14 phyla with more than
 
 
 ## Structure
-<<<<<<< content/3.defense-systems/thoeris.md
 
 ### Experimentaly determined structure
 
@@ -72,8 +73,6 @@ dataUrls:
 ---
 ::
 
-=======
->>>>>>> content/3.defense-systems/thoeris.md
 ### Thoeris_I
 ##### Example 1