diff --git a/umap/static/umap/locale/de.js b/umap/static/umap/locale/de.js
index 2a6c6fea..ba8c0ee2 100644
--- a/umap/static/umap/locale/de.js
+++ b/umap/static/umap/locale/de.js
@@ -384,4 +384,4 @@ var locale = {
     "Will be permanently visible in the bottom left corner of the map": "Wird in der unteren linken Ecke der Karte permanent sichtbar sein"
 };
 L.registerLocale("de", locale);
-L.setLocale("de");
\ No newline at end of file
+L.setLocale("de");
diff --git a/umap/static/umap/locale/de.json b/umap/static/umap/locale/de.json
index de448695..72069e20 100644
--- a/umap/static/umap/locale/de.json
+++ b/umap/static/umap/locale/de.json
@@ -382,4 +382,8 @@
     "Permanent credits background": "Dauerhafte Danksagung im Hintergrund",
     "Select data": "Wähle Daten aus",
     "Will be permanently visible in the bottom left corner of the map": "Wird in der unteren linken Ecke der Karte permanent sichtbar sein"
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> 15a1802 (i18n)