diff --git a/app/assets/javascripts/timeline-editor.js b/app/assets/javascripts/timeline-editor.js
index 664428eb..3c66c84b 100644
--- a/app/assets/javascripts/timeline-editor.js
+++ b/app/assets/javascripts/timeline-editor.js
@@ -136,8 +136,4 @@ $(document).ready(function () {
     // return false so we don't jump to the top of the page
     return false;
   });
-<<<<<<< HEAD
-=======
-
->>>>>>> master
 });