diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml
index 5516e1e5db..839a4a3937 100644
--- a/addons/missileguidance/stringtable.xml
+++ b/addons/missileguidance/stringtable.xml
@@ -46,7 +46,6 @@
         </Key>
         <Key ID="STR_ACE_Hydra70_DAGR_Desc">
             <English>Hydra-70 DAGR Laser Guided Missile</English>
-            <French>Missile à guidage Hydra-70 DAGR</French>
             <Spanish>Misil guiado por láser Hydra-70 DAGR</Spanish>
             <French>Missile à guidage laser Hydra-70 DAGR</French>
             <Polish>Laserowo naprowadzana rakieta Hydra-70 DAGR</Polish>
diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml
index df71dceb57..64e95133ba 100644
--- a/addons/optionsmenu/stringtable.xml
+++ b/addons/optionsmenu/stringtable.xml
@@ -149,13 +149,8 @@
         </Key>
         <Key ID="STR_ACE_OptionsMenu_scalarType">
             <English>Number</English>
-<<<<<<< HEAD
-            <German>Nummer</German>
-            <Spanish>Número</Spanish>
-=======
             <German>Zahl</German>
-            <Spanish>Numero</Spanish>
->>>>>>> acemod/master
+            <Spanish>Número</Spanish>
             <Russian>Число</Russian>
             <Czech>Číslo</Czech>
             <Polish>Cyfra</Polish>
@@ -222,12 +217,8 @@
             <English>Option Menu UI Scaling</English>
             <French>Menu option: taille de l'UI</French>
             <Polish>Skalowanie UI menu ustawień</Polish>
-<<<<<<< HEAD
-            <Spanish>Menú de opciónes de escalado de la interfaz de usuario</Spanish>
-=======
-            <Spanish>Opción de escalado del menú UI</Spanish>
+            <Spanish>Opción de escalado del menú IU</Spanish>
             <German>UI Skalierung</German>
->>>>>>> acemod/master
         </Key>
     </Package>
 </Project>
\ No newline at end of file