diff --git a/themes/candy_json/candy_json.tmTheme b/themes/candy_json/candy_json.tmTheme
index c35021d..e5b0c15 100644
--- a/themes/candy_json/candy_json.tmTheme
+++ b/themes/candy_json/candy_json.tmTheme
@@ -623,6 +623,94 @@
+
+
+
+ name
+ Conflict Begin
+
+ scope
+
+ meta.block.conflict.begin.diff,
+ punctuation.section.block.begin.diff
+
+
+ settings
+
+ foreground
+ #FF6188
+
+ fontStyle
+ bold
+
+
+
+
+
+
+
+ name
+ Conflict Separator
+
+ scope
+
+ meta.block.conflict.separator.diff,
+ punctuation.section.block.diff
+
+
+ settings
+
+ foreground
+ #FFD866
+
+ fontStyle
+ bold
+
+
+
+
+
+
+
+ name
+ Conflict End
+
+ scope
+
+ meta.block.conflict.end.diff,
+ punctuation.section.block.end.diff
+
+
+ settings
+
+ foreground
+ #A9DC76
+
+ fontStyle
+ bold
+
+
+
+
+
+
+
+ name
+ Branch Name
+
+ scope
+ entity.name.section.diff
+
+ settings
+
+ foreground
+ #78DCE8
+
+ fontStyle
+ bold
+
+
+