diff --git a/js/expand-video.js b/js/expand-video.js
index f268d550..0e9ddcbb 100644
--- a/js/expand-video.js
+++ b/js/expand-video.js
@@ -356,8 +356,4 @@ onready(function(){
         });
         observer.observe(document.body, {childList: true, subtree: true});
     }
-<<<<<<< HEAD
 });
-=======
-});
->>>>>>> 02708219d3aea65bffe40f6bc893e08dda1290ec