diff --git a/src/pretix/locale/de/LC_MESSAGES/django.po b/src/pretix/locale/de/LC_MESSAGES/django.po
index 322ac41ee..3e9420a24 100644
--- a/src/pretix/locale/de/LC_MESSAGES/django.po
+++ b/src/pretix/locale/de/LC_MESSAGES/django.po
@@ -5,7 +5,11 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-04-19 14:58+0000\n"
+<<<<<<< HEAD
 "PO-Revision-Date: 2021-04-20 07:49+0000\n"
+=======
+"PO-Revision-Date: 2021-04-20 07:36+0000\n"
+>>>>>>> 3224f7d26... Translated on translate.pretix.eu (German)
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix/de/"
 ">\n"