fix merge conflicts

demo/kitchen-sink/demo.js

@@ -121,7 +121,7 @@ var modes = [
     new Mode("xml", "XML", ["xml"]),
     new Mode("sh", "SH", ["sh"]),
     new Mode("xquery", "XQuery", ["xq"]),
-    new Mode("yaml", "YAML", require("ace/mode/yaml").Mode, ["yaml"])
+    new Mode("yaml", "YAML", ["yaml"])
 ];
 
 modesByName = {};

lib/ace/mode/yaml_highlight_rules.js

@@ -57,8 +57,8 @@ var YamlHighlightRules = function() {
                 token: "variable",
                 regex: "[&\\*][a-zA-Z0-9-_]+"
             }, {
-                token: "identifier",
-                regex: "(\\w+\\s*:)(?:\\w*)"
+                token: ["identifier", "text"],
+                regex: "(\\w+\\s*:)(\\w*)"
             }, {
                 token : "keyword.operator",
                 regex : "<<\\w*:\\w*"