From 06722f63d238117bfbf46f2483884a9bb5e11d0f Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Mon, 11 Aug 2025 17:25:55 +0200
Subject: [PATCH] Removed the unintended icons that came from merge conflicts

---
 templates/ui/combatTracker/combatTrackerHeader.hbs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/templates/ui/combatTracker/combatTrackerHeader.hbs b/templates/ui/combatTracker/combatTrackerHeader.hbs
index a34e4743..9ecff9e6 100644
--- a/templates/ui/combatTracker/combatTrackerHeader.hbs
+++ b/templates/ui/combatTracker/combatTrackerHeader.hbs
@@ -51,18 +51,6 @@
     {{/if}}
 
     <div class="encounter-controls {{#if hasCombat}}combat{{/if}}">
-        {{#if hasCombat}}
-            <div class="encounter-fear-controls">
-                <div class="encounter-fear-dice-container">
-                    <div class="encounter-control-fear-container">
-                        <div class="dice d12"></div>
-                        <i class="fas fa-skull encounter-control-fear"></i>
-                    </div>
-                    <div>{{fear}}</div>
-                </div>
-                <a class="encounter-countdowns" data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.Countdown.title" type=(localize "DAGGERHEART.APPLICATIONS.Countdown.types.encounter")}}" data-action="openCountdowns"><i class="fa-solid fa-stopwatch"></i></a>
-            </div>
-        {{/if}}
         {{!-- Combat Status --}}
         <strong class="encounter-title">
             {{#if combats.length}}