diff --git a/support/locale/es/LC_MESSAGES/django.po b/support/locale/es/LC_MESSAGES/django.po
index ee99314..1a09dba 100644
--- a/support/locale/es/LC_MESSAGES/django.po
+++ b/support/locale/es/LC_MESSAGES/django.po
@@ -7,15 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2017-09-22 14:59+0000\n"
-"PO-Revision-Date: 2017-06-16 17:00+0000\n"
-"Last-Translator: Livvy <livvy@base.nu>\n"
-=======
 "POT-Creation-Date: 2017-06-16 16:18+0000\n"
 "PO-Revision-Date: 2017-09-22 15:06+0000\n"
 "Last-Translator: Tom Wragg <tom@ojuso.org>\n"
->>>>>>> Manually commit changes from weblate
 "Language-Team: Spanish <http://translate.ojuso.org/projects/platform/map/es/>"
 "\n"
 "Language: es\n"