diff --git a/frontend/messages/de.json b/frontend/messages/de.json
index 9196a69e..28dbd9cd 100644
--- a/frontend/messages/de.json
+++ b/frontend/messages/de.json
@@ -810,7 +810,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 111d916e..b173ecdd 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -810,7 +810,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 4f101339..56c3f41a 100644
--- a/frontend/messages/es.json
+++ b/frontend/messages/es.json
@@ -810,7 +810,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)",