diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index 4a49e1b..1a3475a 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -1918,6 +1918,7 @@
   "tcpConnectionFailed": "Error en la conexión TCP: {error}",
   "map_showDiscoveryContacts": "Mostrar Contactos de Descubrimiento",
   "map_setAsMyLocation": "Establecer mi ubicación",
+<<<<<<< HEAD
   "@path_routeWeight": {
     "placeholders": {
       "weight": {
@@ -1928,6 +1929,8 @@
       }
     }
   },
+=======
+>>>>>>> c9e3ceb (feat: Enhance privacy settings and telemetry (#308))
   "settings_privacySubtitle": "Controlar qué información se comparte.",
   "settings_allowByContact": "Permitir por banderas de contacto",
   "settings_denyAll": "Denegar todo",
@@ -1957,6 +1960,7 @@
       }
     }
   },
+<<<<<<< HEAD
   "appSettings_initialRouteWeight": "Peso inicial de la ruta",
   "appSettings_maxRouteWeight": "Peso máximo permitido para la ruta",
   "appSettings_initialRouteWeightSubtitle": "Peso inicial para rutas recién descubiertas",
@@ -1970,4 +1974,9 @@
   "path_routeWeight": "{weight}/{max}",
   "settings_telemetryModeUpdated": "Modo de telemetría actualizado",
   "settings_multiAck": "Multi-ACKs: {value}"
-}
\ No newline at end of file
+}
+=======
+  "settings_telemetryModeUpdated": "Modo de telemetría actualizado",
+  "settings_multiAck": "Multi-ACKs: {value}"
+}
+>>>>>>> c9e3ceb (feat: Enhance privacy settings and telemetry (#308))