diff --git a/template/src/oj/contest/submissions_list.html b/template/src/oj/contest/submissions_list.html
index 0ae3031..1424bb1 100644
--- a/template/src/oj/contest/submissions_list.html
+++ b/template/src/oj/contest/submissions_list.html
@@ -65,10 +65,6 @@
                 </thead>
                 {% if submissions %}
                 <tbody>
-<<<<<<< HEAD
-
-=======
->>>>>>> dev
                 {% for item in submissions %}
                     <tr>
                         {% ifequal item.user_id request.user.id %}