Improve merge.

Author: demiankatz

src/index.html

@@ -399,10 +399,6 @@ <h2 class="controls-title">Duration</h2>
         var $youtube_mutedCheckbox = youTubeTab.querySelector(
           "#youtube_mutedCheckbox"
         );
-        var $customConfig = document.getElementById("customConfig");
-        var $setConfigButton = document.getElementById("setConfigButton");
-        var $setYouTubeVideoIdButton = document.getElementById(
-          "setYouTubeVideoIdButton"
         var $youtube_durationStart = youTubeTab.querySelector(
           "#youtube_durationStart"
         );
@@ -413,6 +409,10 @@ <h2 class="controls-title">Duration</h2>
           "#youtube_setDurationButton"
         );
 
+        // config controls
+        var $customConfig = document.getElementById("customConfig");
+        var $setConfigButton = document.getElementById("setConfigButton");
+        
         var annotations = [];
         var urlAdapter;