diff --git a/frontend/messages/de.json b/frontend/messages/de.json
index c20394a1..25ad5edb 100644
--- a/frontend/messages/de.json
+++ b/frontend/messages/de.json
@@ -811,7 +811,6 @@
 	"pagination_next": "Weiter",
 	"pagination_page_of": "Seite {page} von {total}",
 	"pagination_nav_label": "Seitennavigation",
-<<<<<<< HEAD
 
 	"common_opens_new_tab": "(öffnet in neuem Tab)",
 
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index a57ca05d..523fa7af 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -811,7 +811,6 @@
 	"pagination_next": "Next",
 	"pagination_page_of": "Page {page} of {total}",
 	"pagination_nav_label": "Pagination",
-<<<<<<< HEAD
 
 	"common_opens_new_tab": "(opens in new tab)",
 
diff --git a/frontend/messages/es.json b/frontend/messages/es.json
index a64424a0..b725d39b 100644
--- a/frontend/messages/es.json
+++ b/frontend/messages/es.json
@@ -811,7 +811,6 @@
 	"pagination_next": "Siguiente",
 	"pagination_page_of": "Página {page} de {total}",
 	"pagination_nav_label": "Paginación",
-<<<<<<< HEAD
 
 	"common_opens_new_tab": "(abre en pestaña nueva)",