diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 2e975d62..34fecd22 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -4675,15 +4675,5 @@ msgstr "Status -Updates von {obj.display_name}"
 #, python-format
 msgid "Load %(count)d unread status"
 msgid_plural "Load %(count)d unread statuses"
-<<<<<<< HEAD
-msgstr[0] ""
-msgstr[1] ""
-
-#, python-format
-#~ msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
-#~ msgstr "lade <span data-poll=\"stream/%(tab_key)s\">0</span> ungelesene Statusmeldung(en)"
-=======
 msgstr[0] "Lade %(count)d ungelesene Statusmeldung"
 msgstr[1] "Lade %(count)d ungelesene Statusmeldungen"
-
->>>>>>> f84241b085a00b54a2f5ba083e8e60311ccb8622