diff --git a/src/routes/repo/[projectId]/Tray.svelte b/src/routes/repo/[projectId]/Tray.svelte
index 040a39d55..d063b931d 100644
--- a/src/routes/repo/[projectId]/Tray.svelte
+++ b/src/routes/repo/[projectId]/Tray.svelte
@@ -80,7 +80,7 @@
 						{#if !branch.baseCurrent}
 							<!-- branch will cause merge conflicts if applied -->
 							<Tooltip label="Will introduce merge conflicts if applied">
-								<div class="text-blue-500">&#9679;</div>
+								<div class="text-yellow-500">&#9679;</div>
 							</Tooltip>
 						{:else if branch.mergeable}
 							<Tooltip label="Can be applied cleanly">