diff --git a/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po b/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
index 250a036..38d16a6 100644
--- a/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
+++ b/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
@@ -1,22 +1,12 @@
-# SOME DESCRIPTIVE TITLE.
+# German translation of Squirrel Battle
 # Copyright (C) YEAR ÿnérant, eichhornchen, nicomarg, charlse
 # This file is distributed under the same license as the squirrelbattle package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: squirrelbattle 3.14.1\n"
 "Report-Msgid-Bugs-To: squirrel-battle@crans.org\n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"POT-Creation-Date: 2020-12-01 17:10+0100\n"
-=======
 "POT-Creation-Date: 2020-12-05 14:46+0100\n"
->>>>>>> master
-=======
-"POT-Creation-Date: 2020-12-05 14:46+0100\n"
->>>>>>> master
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,7 +85,6 @@ msgstr "Zurück"
 #: squirrelbattle/tests/game_test.py:300 squirrelbattle/tests/game_test.py:303
 #: squirrelbattle/tests/game_test.py:306
 #: squirrelbattle/tests/translations_test.py:16
-#: squirrelbattle/tests/game_test.py:290
 msgid "New game"
 msgstr "Neu Spiel"
 
@@ -210,62 +199,3 @@ msgstr "Bombe"
 #: squirrelbattle/tests/translations_test.py:66
 msgid "heart"
 msgstr "Herz"
-
-#: squirrelbattle/display/statsdisplay.py:34
-msgid "Inventory:"
-msgstr "Bestand:"
-
-#: squirrelbattle/display/statsdisplay.py:39
-msgid "YOU ARE DEAD"
-msgstr "SIE WURDEN GESTORBEN"
-
-#: squirrelbattle/interfaces.py:398 squirrelbattle/interfaces.py:408
-#, python-brace-format
-msgid "{name} hits {opponent}."
-msgstr "{name} schlägt {opponent}."
-
-#: squirrelbattle/interfaces.py:410 squirrelbattle/interfaces.py:420
-#, python-brace-format
-msgid "{name} takes {amount} damage."
-msgstr "{name} nimmt {amount} Schadenspunkte."
-
-#: squirrelbattle/interfaces.py:412 squirrelbattle/interfaces.py:422
-#, python-brace-format
-msgid "{name} dies."
-msgstr "{name} stirbt."
-
-#: squirrelbattle/menus.py:71
-msgid "Back"
-msgstr "Zurück"
-
-#: squirrelbattle/game.py:148
-msgid ""
-"Some keys are missing in your save file.\n"
-"Your save seems to be corrupt. It got deleted."
-msgstr ""
-"In Ihrer Speicherdatei fehlen einige Schlüssel.\n"
-"Ihre Speicherung scheint korrupt zu sein. Es wird gelöscht."
-
-#: squirrelbattle/game.py:156
-msgid ""
-"No player was found on this map!\n"
-"Maybe you died?"
-msgstr ""
-"Auf dieser Karte wurde kein Spieler gefunden!\n"
-"Vielleicht sind Sie gestorben?"
-
-#: squirrelbattle/game.py:176
-msgid ""
-"The JSON file is not correct.\n"
-"Your save seems corrupted. It got deleted."
-msgstr ""
-"Die JSON-Datei ist nicht korrekt.\n"
-"Ihre Speicherung scheint korrumpiert. Sie wurde gelöscht."
-
-#: squirrelbattle/entities/friendly.py:31
-msgid "Flower power!!"
-msgstr "Blumenmacht!!"
-
-#: squirrelbattle/entities/friendly.py:31
-msgid "The sun is warm today"
-msgstr "Die Sonne ist warm heute"