Merge branch 'upstream-desktop'

Author: pol-rivero

app/styles/_variables.scss

@@ -16,7 +16,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
   --color-deleted: #{$red-600};
   --color-modified: #{darken($yellow-700, 10%)};
   --color-renamed: #{$blue};
-  --color-conflicted: #{$orange-600};
+  --color-conflicted: #{$orange-800};
 
   --text-color: #{$gray-900};
   --text-secondary-color: #{$gray-500};