diff --git a/djangopypi/templates/djangopypi/release_manage_files.html b/djangopypi/templates/djangopypi/release_manage_files.html
index 0b77011..9c7de98 100644
--- a/djangopypi/templates/djangopypi/release_manage_files.html
+++ b/djangopypi/templates/djangopypi/release_manage_files.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {% extends 'djangopypi/base.html' %}
 {% block title %}Manage {{ release }} Files{% endblock %}
 {% block content %}