diff --git a/ASP/ASP.sublime-syntax b/ASP/ASP.sublime-syntax
index ad902bfc8f..65fe0ad680 100644
--- a/ASP/ASP.sublime-syntax
+++ b/ASP/ASP.sublime-syntax
@@ -59,7 +59,7 @@ contexts:
         - include: root_asp
         - match: \n
           pop: true
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   line_continuation_char:
     - match: '\b_'
diff --git a/AppleScript/AppleScript.sublime-syntax b/AppleScript/AppleScript.sublime-syntax
index 438826d77d..0190a15475 100644
--- a/AppleScript/AppleScript.sublime-syntax
+++ b/AppleScript/AppleScript.sublime-syntax
@@ -543,7 +543,7 @@ contexts:
             0: punctuation.definition.comment.applescript
           pop: true
         - include: comments.nested
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   comments.nested:
     - match: \(\*
@@ -556,7 +556,7 @@ contexts:
             0: punctuation.definition.comment.applescript
           pop: true
         - include: comments.nested
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   data-structures:
     - match: '(\{)'
diff --git a/Batch File/Batch File.sublime-syntax b/Batch File/Batch File.sublime-syntax
index 5cc28173e5..7eaddfb907 100644
--- a/Batch File/Batch File.sublime-syntax	
+++ b/Batch File/Batch File.sublime-syntax	
@@ -173,7 +173,7 @@ contexts:
     - match: '{{label_comment}}'
       scope: punctuation.definition.comment.dosbatch
       push: comment-body
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   comment-body:
     - meta_scope: comment.line.colon.dosbatch
diff --git a/C#/C#.sublime-syntax b/C#/C#.sublime-syntax
index 5b12de5c0b..c62bc98f71 100644
--- a/C#/C#.sublime-syntax
+++ b/C#/C#.sublime-syntax
@@ -83,7 +83,7 @@ contexts:
           captures:
             1: punctuation.definition.comment.cs
         - include: comments_in
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   comments_in:
     - match: \b(?i:todo|hack|xxx)\b
diff --git a/C++/C.sublime-syntax b/C++/C.sublime-syntax
index afbb715c98..2763016913 100644
--- a/C++/C.sublime-syntax
+++ b/C++/C.sublime-syntax
@@ -67,7 +67,7 @@ contexts:
   comments:
     - include: block-comments
     - include: line-comments
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   block-comments:
     - match: ^(/\*) =\s*(.*?)\s*= (\*/)$\n?
diff --git a/CSS/CSS.sublime-syntax b/CSS/CSS.sublime-syntax
index 8a6c6740f3..2c96a9384b 100644
--- a/CSS/CSS.sublime-syntax
+++ b/CSS/CSS.sublime-syntax
@@ -387,7 +387,7 @@ contexts:
     - match: /\*+
       scope: punctuation.definition.comment.begin.css
       push: block-comment-body
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   block-comment-body:
     - meta_scope: comment.block.css
@@ -397,7 +397,7 @@ contexts:
     - match: ^\s*(\*)(?!/)
       captures:
         1: punctuation.definition.comment.css
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
 ###[ AT RULES ]################################################################
 
diff --git a/Clojure/Clojure.sublime-syntax b/Clojure/Clojure.sublime-syntax
index f59bc17a36..14be738554 100644
--- a/Clojure/Clojure.sublime-syntax
+++ b/Clojure/Clojure.sublime-syntax
@@ -226,7 +226,7 @@ contexts:
     - match: \^
       scope: keyword.operator.macro.clojure
       push: pop-expr
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   pop-dispatch-expr:
     - match: (?=\s)
diff --git a/D/D.sublime-syntax b/D/D.sublime-syntax
index a8484f30f7..b080d2b65e 100644
--- a/D/D.sublime-syntax
+++ b/D/D.sublime-syntax
@@ -195,7 +195,7 @@ contexts:
       captures:
         1: punctuation.definition.comment.d
     - include: nested-comment
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
   nested-comment:
     - match: /\+(\+(?!/))?
       scope: punctuation.definition.comment.d
diff --git a/Diff/Diff3.sublime-syntax b/Diff/Diff3.sublime-syntax
index 2461f69df6..2d5478aaae 100644
--- a/Diff/Diff3.sublime-syntax
+++ b/Diff/Diff3.sublime-syntax
@@ -11,7 +11,7 @@
 #
 # see: https://www.gnu.org/software/diffutils/manual/diffutils.html
 name: Diff3
-scope: text.diff3
+scope: source.diff3
 version: 2
 
 contexts:
diff --git a/Erlang/Erlang.sublime-syntax b/Erlang/Erlang.sublime-syntax
index f070fb4785..4a0b3b45f6 100644
--- a/Erlang/Erlang.sublime-syntax
+++ b/Erlang/Erlang.sublime-syntax
@@ -238,7 +238,7 @@ contexts:
     - match: \%+
       scope: punctuation.definition.comment.erlang
       push: comment-body
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   comment-body:
     - meta_include_prototype: false
diff --git a/Go/Go.sublime-syntax b/Go/Go.sublime-syntax
index 4b87d74958..7d8301b94a 100644
--- a/Go/Go.sublime-syntax
+++ b/Go/Go.sublime-syntax
@@ -153,7 +153,7 @@ contexts:
     - include: match-comment-magic
     - include: match-comment-line
     - include: match-comment-general
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   match-comment-magic:
     - include: match-comment-magic-general
diff --git a/Graphviz/DOT.sublime-syntax b/Graphviz/DOT.sublime-syntax
index 3b10116b3f..8c3d09e998 100644
--- a/Graphviz/DOT.sublime-syntax
+++ b/Graphviz/DOT.sublime-syntax
@@ -18,7 +18,7 @@ contexts:
     - include: expressions
 
   expressions:
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - match: \b((sub|di)?graph)\b\s+((cluster_)?\w+)\b
       captures:
         1: storage.type.dot
diff --git a/Groovy/Groovy.sublime-syntax b/Groovy/Groovy.sublime-syntax
index eea30f59a1..cf9eb98a01 100644
--- a/Groovy/Groovy.sublime-syntax
+++ b/Groovy/Groovy.sublime-syntax
@@ -117,7 +117,7 @@ contexts:
     - match: //
       scope: punctuation.definition.comment.groovy
       push: inside-line-comment
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
   inside-line-comment:
     - meta_scope: comment.line.double-slash.groovy
     - match: $\n?
diff --git a/Haskell/Cabal.sublime-syntax b/Haskell/Cabal.sublime-syntax
index 0ab4ae469a..6a61d052f2 100644
--- a/Haskell/Cabal.sublime-syntax
+++ b/Haskell/Cabal.sublime-syntax
@@ -82,7 +82,7 @@ contexts:
       scope: comment.line.double-dash.cabal
       captures:
         1: punctuation.definition.comment.cabal
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
 ###[ SECTIONS ]################################################################
 
diff --git a/Haskell/Haskell.sublime-syntax b/Haskell/Haskell.sublime-syntax
index b4456ebeab..79c7697e8b 100644
--- a/Haskell/Haskell.sublime-syntax
+++ b/Haskell/Haskell.sublime-syntax
@@ -271,7 +271,7 @@ contexts:
     # https://www.haskell.org/onlinereport/haskell2010/haskellch2.html#x7-170002.3
     - include: line-comments
     - include: block-comments
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   block-comments:
     - match: \{-(?!#)
diff --git a/JSON/JSON.sublime-syntax b/JSON/JSON.sublime-syntax
index 7310cdd743..9abd85c9ef 100644
--- a/JSON/JSON.sublime-syntax
+++ b/JSON/JSON.sublime-syntax
@@ -55,7 +55,7 @@ contexts:
   comments:
     - include: block-comments
     - include: line-comments
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   block-comments:
     # empty block comments
diff --git a/Java/Java.sublime-syntax b/Java/Java.sublime-syntax
index 119ae4108e..253f2cbac2 100644
--- a/Java/Java.sublime-syntax
+++ b/Java/Java.sublime-syntax
@@ -174,7 +174,7 @@ contexts:
   comments:
     - include: line-comments
     - include: block-comments
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   block-comments:
     # empty block comments
diff --git a/JavaScript/JavaScript.sublime-syntax b/JavaScript/JavaScript.sublime-syntax
index 3128b03d95..891edb4d5d 100644
--- a/JavaScript/JavaScript.sublime-syntax
+++ b/JavaScript/JavaScript.sublime-syntax
@@ -129,7 +129,7 @@ contexts:
   comments:
     - include: line-comments
     - include: block-comments
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   block-comments:
     # empty block comments
diff --git a/LaTeX/Bibtex.sublime-syntax b/LaTeX/Bibtex.sublime-syntax
index e3833aff58..27f2f25a09 100644
--- a/LaTeX/Bibtex.sublime-syntax
+++ b/LaTeX/Bibtex.sublime-syntax
@@ -23,7 +23,7 @@ contexts:
     - include: bibtex
 
   bibtex:
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - include: line-comments
     - include: comments
     - include: declarations
diff --git a/LaTeX/TeX.sublime-syntax b/LaTeX/TeX.sublime-syntax
index ae5ae0b16f..4f5807cf7e 100644
--- a/LaTeX/TeX.sublime-syntax
+++ b/LaTeX/TeX.sublime-syntax
@@ -145,7 +145,7 @@ contexts:
   comments:
     - match: '%.*$\n?'
       scope: comment.line.percentage.tex
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
 ###[ BLOCKS ]###################################################################
 
diff --git a/Lisp/Lisp.sublime-syntax b/Lisp/Lisp.sublime-syntax
index ae99312897..d0f4f642a0 100644
--- a/Lisp/Lisp.sublime-syntax
+++ b/Lisp/Lisp.sublime-syntax
@@ -55,7 +55,7 @@ contexts:
   comments:
     - include: line-comments
     - include: block-comments
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - match: \|#
       scope: invalid.illegal.stray-comment-end.lisp
 
diff --git a/Lua/Lua.sublime-syntax b/Lua/Lua.sublime-syntax
index 378780ffaf..a4f51792f2 100644
--- a/Lua/Lua.sublime-syntax
+++ b/Lua/Lua.sublime-syntax
@@ -82,7 +82,7 @@ contexts:
   comments:
     - include: block-comments
     - include: line-comments
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   block-comments:
     - match: --\[\[--
diff --git a/Makefile/Makefile.sublime-syntax b/Makefile/Makefile.sublime-syntax
index 514a5ecc97..91307cf6d0 100644
--- a/Makefile/Makefile.sublime-syntax
+++ b/Makefile/Makefile.sublime-syntax
@@ -377,7 +377,7 @@ contexts:
     - match: \#
       scope: punctuation.definition.comment.makefile
       push: comment-body
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   comment:
     - match: \#
diff --git a/Markdown/Markdown.sublime-syntax b/Markdown/Markdown.sublime-syntax
index 0a8bd96ae6..c8f6e25021 100644
--- a/Markdown/Markdown.sublime-syntax
+++ b/Markdown/Markdown.sublime-syntax
@@ -338,7 +338,7 @@ contexts:
         1: punctuation.section.frontmatter.end.markdown
 
   markdown:
-    - include: scope:text.diff3#conflicts
+    - include: scope:source.diff3#conflicts
     - include: indented-code-blocks
     - include: thematic-breaks
     - include: block-quotes
@@ -757,7 +757,7 @@ contexts:
       pop: 1
 
   list-block-content:
-    - include: scope:text.diff3#conflicts
+    - include: scope:source.diff3#conflicts
     - include: fenced-code-blocks
     - include: html-blocks
     - include: reference-definitions
@@ -2473,7 +2473,7 @@ contexts:
     - include: link-ref
 
   markups:
-    - include: scope:text.diff3#conflicts
+    - include: scope:source.diff3#conflicts
     # Markdown will convert this for us. We match it so that the
     # HTML grammar will not mark it up as invalid.
     - match: '[<>](-+|=+)[<>]?'
diff --git a/Matlab/Matlab.sublime-syntax b/Matlab/Matlab.sublime-syntax
index 8f504d9d19..88e5cf5f21 100644
--- a/Matlab/Matlab.sublime-syntax
+++ b/Matlab/Matlab.sublime-syntax
@@ -461,7 +461,7 @@ contexts:
   comments:
     - include: block-comments
     - include: line-comments
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   block-comments:
     - match: ^\s*(%\{)\s*\n
diff --git a/OCaml/OCaml.sublime-syntax b/OCaml/OCaml.sublime-syntax
index 855cb7f7a0..fb1c62879a 100644
--- a/OCaml/OCaml.sublime-syntax
+++ b/OCaml/OCaml.sublime-syntax
@@ -384,7 +384,7 @@ contexts:
           pop: true
         - match: '\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt''"\\])'
           scope: comment.block.string.constant.character.escape.ocaml
-    - include: scope:text.diff3#conflicts  # merge conflict marker  constants:
+    - include: scope:source.diff3#conflicts  # merge conflict marker  constants:
   constants:
     - match: '(?:\[\s*(\])|\((\))|\(\s*(\)))'
       scope: constant.language.pseudo-variable.ocaml
diff --git a/OCaml/OCamllex.sublime-syntax b/OCaml/OCamllex.sublime-syntax
index 894b10cfaf..e1207cc117 100644
--- a/OCaml/OCamllex.sublime-syntax
+++ b/OCaml/OCamllex.sublime-syntax
@@ -96,7 +96,7 @@ contexts:
           pop: true
         - match: '\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt''"\\])'
           scope: comment.block.string.constant.character.escape.ocaml
-    - include: scope:text.diff3#conflicts  # merge conflict marker  match-patterns:
+    - include: scope:source.diff3#conflicts  # merge conflict marker  match-patterns:
   declaration-matches:
     - match: (\()
       captures:
diff --git a/OCaml/OCamlyacc.sublime-syntax b/OCaml/OCamlyacc.sublime-syntax
index 77fb8667ca..50efca0d82 100644
--- a/OCaml/OCamlyacc.sublime-syntax
+++ b/OCaml/OCamlyacc.sublime-syntax
@@ -60,7 +60,7 @@ contexts:
           pop: true
         - match: '\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt''"\\])'
           scope: comment.block.string.constant.character.escape.ocamlyacc
-    - include: scope:text.diff3#conflicts  # merge conflict marker  declaration-matches:
+    - include: scope:source.diff3#conflicts  # merge conflict marker  declaration-matches:
   declaration-matches:
     - match: (%)(token)
       captures:
diff --git a/PHP/PHP Source.sublime-syntax b/PHP/PHP Source.sublime-syntax
index cd4844b580..15a54ea11e 100644
--- a/PHP/PHP Source.sublime-syntax	
+++ b/PHP/PHP Source.sublime-syntax	
@@ -595,7 +595,7 @@ contexts:
     - match: '#'
       scope: punctuation.definition.comment.php
       push: comment-line-number-sign-body
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   comment-block-body:
     - meta_include_prototype: false
@@ -2508,7 +2508,7 @@ contexts:
     - meta_content_scope: meta.string.heredoc.php string.unquoted.heredoc.php
     - match: '{{heredoc_unquoted_end}}'
       pop: 1
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - include: string-escapes
     - include: string-placeholders
     - include: string-interpolations
@@ -2517,7 +2517,7 @@ contexts:
     - meta_content_scope: meta.string.heredoc.php string.unquoted.heredoc.php
     - match: '{{heredoc_quoted_end}}'
       pop: 1
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - include: string-placeholders
 
 ###[ STRINGS ]################################################################
@@ -2538,7 +2538,7 @@ contexts:
     - match: \`
       scope: punctuation.definition.string.end.php
       pop: 1
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - include: string-escapes
     - include: string-interpolations
     - match: \\.
@@ -2609,7 +2609,7 @@ contexts:
     - meta_include_prototype: false
     - meta_scope: meta.string.php
     - meta_content_scope: string.quoted.double.php
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - include: string-double-quoted-end
     - include: string-escapes
     - include: string-placeholders
@@ -2691,7 +2691,7 @@ contexts:
     - meta_include_prototype: false
     - meta_scope: meta.string.php
     - meta_content_scope: string.quoted.single.php
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - include: string-single-quoted-end
     - include: string-single-quoted-placeholders
     - match: \\[\\'']
diff --git a/Pascal/Pascal.sublime-syntax b/Pascal/Pascal.sublime-syntax
index af799f9339..6467aefcd9 100644
--- a/Pascal/Pascal.sublime-syntax
+++ b/Pascal/Pascal.sublime-syntax
@@ -16,7 +16,7 @@ first_line_match: |-
 
 contexts:
   prototype:
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   main:
     - match: \b(?i:(absolute|abstract|all|and|and_then|array|as|asm|attribute|begin|bindable|case|class|const|constructor|destructor|div|do|do|else|end|except|export|exports|external|far|file|finalization|finally|for|forward|goto|if|implementation|import|in|inherited|initialization|interface|interrupt|is|label|library|mod|module|name|near|nil|not|object|of|only|operator|or|or_else|otherwise|packed|pow|private|program|property|protected|public|published|qualified|record|repeat|resident|restricted|segment|set|shl|shr|then|to|try|type|unit|until|uses|value|var|view|virtual|while|with|xor))\b
diff --git a/Perl/Perl.sublime-syntax b/Perl/Perl.sublime-syntax
index 22baaac7df..02865639cf 100644
--- a/Perl/Perl.sublime-syntax
+++ b/Perl/Perl.sublime-syntax
@@ -137,7 +137,7 @@ contexts:
     - include: expressions-common
 
   expressions-common:
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - include: sub
     - include: quoted-like
     - include: label
diff --git a/Python/Python.sublime-syntax b/Python/Python.sublime-syntax
index 03b815f0f1..36f718f292 100644
--- a/Python/Python.sublime-syntax
+++ b/Python/Python.sublime-syntax
@@ -376,7 +376,7 @@ contexts:
       push:
         - comment-body
         - type-hint
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   comment-body:
     - meta_scope: comment.line.number-sign.python
@@ -4167,7 +4167,7 @@ contexts:
   # for use by inheriting syntaxes to easily inject string interpolation
   # in any kind of quoted or unquoted string
   string-prototype:
-    - include: scope:text.diff3#conflicts
+    - include: scope:source.diff3#conflicts
 
 ###[ PROTOTYPES ]#############################################################
 
diff --git a/R/R.sublime-syntax b/R/R.sublime-syntax
index c7e5d119d6..28cd898df7 100644
--- a/R/R.sublime-syntax
+++ b/R/R.sublime-syntax
@@ -55,7 +55,7 @@ contexts:
         - meta_scope: comment.line.number-sign.r
         - match: \n
           pop: true
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   constants:
     - match: \b(pi|letters|LETTERS|month\.abb|month\.name)\b
diff --git a/Rails/HAML.sublime-syntax b/Rails/HAML.sublime-syntax
index b4d8d6e159..5dd1c38112 100644
--- a/Rails/HAML.sublime-syntax
+++ b/Rails/HAML.sublime-syntax
@@ -52,7 +52,7 @@ contexts:
         2: meta.brackets.haml
         3: punctuation.section.brackets.begin.haml
         4: punctuation.section.brackets.end.haml
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   comment-body:
     - meta_include_prototype: false
diff --git a/RestructuredText/reStructuredText.sublime-syntax b/RestructuredText/reStructuredText.sublime-syntax
index 15b1d5a6a3..d9dd9f49d2 100644
--- a/RestructuredText/reStructuredText.sublime-syntax
+++ b/RestructuredText/reStructuredText.sublime-syntax
@@ -16,7 +16,7 @@ contexts:
           pop: true
         - include: inline
   inline:
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - match: '^(\s*)((\.\.)\s+raw(::)) html'
       comment: directives.html
       captures:
diff --git a/Ruby/Ruby.sublime-syntax b/Ruby/Ruby.sublime-syntax
index 16df083c5b..bdeee45ac9 100644
--- a/Ruby/Ruby.sublime-syntax
+++ b/Ruby/Ruby.sublime-syntax
@@ -122,7 +122,7 @@ contexts:
         - meta_scope: comment.line.number-sign.ruby
         - match: \n
           pop: true
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   class:
     # Defining a class method
@@ -2152,7 +2152,7 @@ contexts:
     - meta_scope: meta.string.heredoc.ruby
     - meta_content_scope: string.unquoted.heredoc.ruby
     - include: indented-heredoc-end
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - include: interpolated-ruby
     - include: escaped-char
 
@@ -2160,13 +2160,13 @@ contexts:
     - meta_scope: meta.string.heredoc.ruby
     - meta_content_scope: string.unquoted.heredoc.ruby
     - include: indented-heredoc-end
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   heredoc-plain-unindented-interpolated:
     - meta_scope: meta.string.heredoc.ruby
     - meta_content_scope: string.unquoted.heredoc.ruby
     - include: unindented-heredoc-end
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - include: interpolated-ruby
     - include: escaped-char
 
@@ -2174,7 +2174,7 @@ contexts:
     - meta_scope: meta.string.heredoc.ruby
     - meta_content_scope: string.unquoted.heredoc.ruby
     - include: unindented-heredoc-end
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   heredoc-shell:
     - match: (<<[-~])(["`]?)({{heredoc_type_shell}})(["`]?)
diff --git a/Rust/Rust.sublime-syntax b/Rust/Rust.sublime-syntax
index 03e071350a..6f7ce3d31a 100644
--- a/Rust/Rust.sublime-syntax
+++ b/Rust/Rust.sublime-syntax
@@ -1280,7 +1280,7 @@ contexts:
   comments:
     - include: line-comments
     - include: block-comments
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   line-comments:
     - match: //[!/]
diff --git a/Scala/Scala.sublime-syntax b/Scala/Scala.sublime-syntax
index af949ba428..aecaeca63b 100644
--- a/Scala/Scala.sublime-syntax
+++ b/Scala/Scala.sublime-syntax
@@ -94,7 +94,7 @@ contexts:
   prototype:
     - include: comments
     - include: block-comments
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   main:
     - include: main-pre-lambdas
diff --git a/ShellScript/Bash.sublime-syntax b/ShellScript/Bash.sublime-syntax
index 9e41008eaa..7fc02a40cc 100644
--- a/ShellScript/Bash.sublime-syntax
+++ b/ShellScript/Bash.sublime-syntax
@@ -91,7 +91,7 @@ contexts:
     - match: \#+
       scope: punctuation.definition.comment.shell
       push: comments-body
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   comments-body:
     - meta_scope: comment.line.number-sign.shell
@@ -2083,7 +2083,7 @@ contexts:
   # for use by inheriting syntaxes to easily inject string interpolation
   # in any kind of quoted or unquoted string
   string-prototype:
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
 ###[ STRING PATH PATTERN MATCHING ]############################################
 
diff --git a/XML/XML.sublime-syntax b/XML/XML.sublime-syntax
index 8be4ab439d..0d7b54d6c6 100644
--- a/XML/XML.sublime-syntax
+++ b/XML/XML.sublime-syntax
@@ -145,7 +145,7 @@ variables:
 
 contexts:
   prototype:
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   main:
     - include: preprocessor
@@ -177,7 +177,7 @@ contexts:
     - match: ']]>'
       scope: punctuation.definition.tag.end.xml
       pop: 1
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
 ###[ COMMENT ]################################################################
 
@@ -194,7 +194,7 @@ contexts:
       pop: 1
     - match: -{2,}
       scope: invalid.illegal.double-hyphen-within-comment.xml
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
 ###[ DOCTYPE DECLARATION ]####################################################
 
@@ -723,7 +723,7 @@ contexts:
     - include: string-common-content
 
   string-common-content:
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
     - include: tag-end-missing-pop
     - include: entity
     - include: should-be-entity
diff --git a/YAML/YAML.sublime-syntax b/YAML/YAML.sublime-syntax
index 07e7d1481e..c312e98456 100644
--- a/YAML/YAML.sublime-syntax
+++ b/YAML/YAML.sublime-syntax
@@ -304,7 +304,7 @@ contexts:
         (?: ^ [ \t]* | [ \t]+ )
         (?=\#)
       push: comment-begin
-    - include: scope:text.diff3#conflicts  # merge conflict marker
+    - include: scope:source.diff3#conflicts  # merge conflict marker
 
   comment-begin:
     - meta_include_prototype: false