diff --git a/gradebook.html b/gradebook.html
index e4fe98152f..bf1430d657 100644
--- a/gradebook.html
+++ b/gradebook.html
@@ -1,4 +1,3 @@
-<<<<<<< local
 <%inherit file="main.html" />
 <%namespace name="profile_graphs" file="profile_graphs.js"/>