diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts
index 9cdc703..dd080b6 100644
--- a/translations/harbour-fernschreiber-es.ts
+++ b/translations/harbour-fernschreiber-es.ts
@@ -1756,6 +1756,7 @@
     </message>
     <message>
         <source>1 week</source>
+<<<<<<< HEAD
         <translation> 1 semana</translation>
     </message>
     <message>