diff --git a/local/languages/de.ini b/local/languages/de.ini
index f88f78a725946174c2a2efc1cb3689765b9a2bec..168d3f107d480a49498d82ae5102ffda49e56eed 100644
--- a/local/languages/de.ini
+++ b/local/languages/de.ini
@@ -2003,7 +2003,6 @@ Search type = "Suchtyp"
 
 License = "Lizenz"
 
-<<<<<<< HEAD
 ; #17717
 Skip to content = "Zum Inhalt"
 
diff --git a/local/languages/en.ini b/local/languages/en.ini
index fc81295f0378c475edeb3efdf1530d8d11993201..d6af5e6fc281bacd54a766b43ae3111107fd5259 100644
--- a/local/languages/en.ini
+++ b/local/languages/en.ini
@@ -2098,7 +2098,6 @@ Skip to search = "Skip to search"
 
 License = "License"
 
-<<<<<<< HEAD
 ; #17717
 ; only necessary in en.ini
 skip-to = "Skip to "