fix merge conflicts

demo/demo.js

@@ -677,27 +677,26 @@ define(function(require, exports, module) {
             session.addFold(placeHolder, range);
         }
     }
-};
-
-var themes = {};
-function loadTheme(name, callback) {
-    if (themes[name])
-        return;
-        
-    themes[name] = 1;
-    var base = name.split("/").pop();
-    var fileName = "src/theme-" + base + ".js";
-    loadScriptFile(fileName, callback)
-}
-
-function loadScriptFile(path, callback) {
-    var head = document.getElementsByTagName('head')[0];
-    var s = document.createElement('script');
-
-    s.src = path;
-    head.appendChild(s);
     
-    s.onload = callback;
+    var themes = {};
-}
+    function loadTheme(name, callback) {
+        if (themes[name])
+            return;
+
+        themes[name] = 1;
+        var base = name.split("/").pop();
+        var fileName = "src/theme-" + base + ".js";
+        loadScriptFile(fileName, callback)
+    }
+
+    function loadScriptFile(path, callback) {
+        var head = document.getElementsByTagName('head')[0];
+        var s = document.createElement('script');
+
+        s.src = path;
+        head.appendChild(s);
+
+        s.onload = callback;
+    }
 
 });

kitchen-sink.html

@@ -228,7 +228,7 @@
 <!--PACKAGE
   <script src="demo/kitchen-sink-uncompressed.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
-    require("demo/boot");
+    require("demo/demo");
   </script>
 PACKAGE-->