diff --git a/lib/ace/mode/_test/tokens_xquery.json b/lib/ace/mode/_test/tokens_xquery.json
index 93f43af3..3b29b156 100644
--- a/lib/ace/mode/_test/tokens_xquery.json
+++ b/lib/ace/mode/_test/tokens_xquery.json
@@ -1,3 +1,4 @@
+<<<<<<< .mine
 [[
    "start",
   ["keyword","xquery"],
@@ -43,4 +44,238 @@
   ["text",">"]
 ],[
    "start"
-]]
\ No newline at end of file
+]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+[
+  [
+    "[\"start\"]",
+    [
+      "keyword",
+      "xquery"
+    ],
+    [
+      "text",
+      " "
+    ],
+    [
+      "keyword",
+      "version"
+    ],
+    [
+      "text",
+      " "
+    ],
+    [
+      "string",
+      "\""
+    ],
+    [
+      "string",
+      "1.0"
+    ],
+    [
+      "string",
+      "\""
+    ],
+    [
+      "text",
+      ";"
+    ]
+  ],
+  [
+    "[\"start\"]"
+  ],
+  [
+    "[\"start\"]",
+    [
+      "keyword",
+      "let"
+    ],
+    [
+      "text",
+      " "
+    ],
+    [
+      "variable",
+      "$message"
+    ],
+    [
+      "text",
+      " "
+    ],
+    [
+      "keyword.operator",
+      ":="
+    ],
+    [
+      "text",
+      " "
+    ],
+    [
+      "string",
+      "\""
+    ],
+    [
+      "string",
+      "Hello World!"
+    ],
+    [
+      "string",
+      "\""
+    ]
+  ],
+  [
+    "[\"start\",\"StartTag\",\"TagContent\"]",
+    [
+      "keyword",
+      "return"
+    ],
+    [
+      "text",
+      " "
+    ],
+    [
+      "meta.tag",
+      "<results"
+    ],
+    [
+      "meta.tag",
+      ">"
+    ]
+  ],
+  [
+    "[\"start\",\"StartTag\",\"TagContent\"]",
+    [
+      "text",
+      "  "
+    ],
+    [
+      "meta.tag",
+      "<message"
+    ],
+    [
+      "meta.tag",
+      ">"
+    ],
+    [
+      "text",
+      "{"
+    ],
+    [
+      "variable",
+      "$message"
+    ],
+    [
+      "text",
+      "}"
+    ],
+    [
+      "meta.tag",
+      "</message>"
+    ]
+  ],
+  [
+    "[\"start\"]",
+    [
+      "meta.tag",
+      "</results>"
+    ]
+  ],
+  [
+    "[\"start\"]"
+  ]
+]
+>>>>>>> .theirs
\ No newline at end of file
diff --git a/lib/ace/mode/xquery/XQueryLexer.js b/lib/ace/mode/xquery/XQueryLexer.js
index ee874a5f..481cd13c 100644
--- a/lib/ace/mode/xquery/XQueryLexer.js
+++ b/lib/ace/mode/xquery/XQueryLexer.js
@@ -199,7 +199,8 @@ exports.XQueryLexer = function() {
   this.tokens = [];
   
   this.getLineTokens = function(line, state, row) {
-    var stack = JSON.parse(state || '["start"]');
+    state = (state === "start" || !state) ? '["start"]' : state;
+    var stack = JSON.parse(state);
     var h = new TokenHandler(line);
     var tokenizer = new XQueryTokenizer(line, h);
     var tokens = [];