From 7c9fa73b9daa5dfa755d6241450fd2364e10dbd2 Mon Sep 17 00:00:00 2001
From: bijx <bsamiee@hotmail.com>
Date: Fri, 24 Apr 2026 00:22:07 -0400
Subject: [PATCH] merge conflict resolution

---
 src/client/graphics/layers/NameLayer.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/client/graphics/layers/NameLayer.ts b/src/client/graphics/layers/NameLayer.ts
index 83d8f64d5..a1b96a335 100644
--- a/src/client/graphics/layers/NameLayer.ts
+++ b/src/client/graphics/layers/NameLayer.ts
@@ -374,13 +374,6 @@ export class NameLayer implements Layer {
     }
     render.troopsDiv.textContent = renderTroops(render.player.troops());
 
-    const fontColor = this.theme.textColor(render.player);
-    if (render.fontColor !== fontColor) {
-      render.fontColor = fontColor;
-      render.nameDiv.style.color = fontColor;
-      render.troopsDiv.style.color = fontColor;
-    }
-
     // Handle icons
     const iconSize = Math.min(render.fontSize * 1.5, 48);
     const darkMode = this.userSettings.darkMode();