Merge pull request #1456 from Microsoft/mergeMarkers

Make the compiler resilient to encountering merge conflict markers in a source code file.

src/services/services.ts

@@ -5920,6 +5920,7 @@ module ts {
                     return TokenClass.StringLiteral;
                 case SyntaxKind.RegularExpressionLiteral:
                     return TokenClass.RegExpLiteral;
+                case SyntaxKind.ConflictMarkerTrivia:
                 case SyntaxKind.MultiLineCommentTrivia:
                 case SyntaxKind.SingleLineCommentTrivia:
                     return TokenClass.Comment;