diff --git a/studenteval/templates/studenteval/all_pdf_template.html b/studenteval/templates/studenteval/all_pdf_template.html
index 0eb04f0..2505755 100644
--- a/studenteval/templates/studenteval/all_pdf_template.html
+++ b/studenteval/templates/studenteval/all_pdf_template.html
@@ -9,11 +9,7 @@
                 }
                 @frame footer_frame {           /* Another static Frame */
                     -pdf-frame-content: footer_content;
-<<<<<<< HEAD
                     left: 50pt;  top: 20pt; height: 20pt;
-=======
-                    left: 50pt;  bottom: 20pt; height: 20pt;
->>>>>>> a286e0eaa8c391c4786993d1954e3028466c782a
                 }
             }