From 9b3632be2f2bb5401587f82e867ba5b923cd6018 Mon Sep 17 00:00:00 2001
From: Dapoolp <elcatnet@gmail.com>
Date: Fri, 1 Aug 2025 20:41:20 +0200
Subject: [PATCH] Fix conflict

---
 lang/en.json                 | 5 +----
 styles/less/global/chat.less | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index 3e17cd73..57d0fafc 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -2302,11 +2302,8 @@
                 "dragApplyEffect": "Drag effect to apply it to an actor",
                 "appliedEvenIfSuccessful": "Applied even if save succeeded",
                 "diceIsRerolled": "The dice has been rerolled (x{times})",
-<<<<<<< HEAD
-                "pendingSaves": "Pending Reaction Rolls"
-=======
+                "pendingSaves": "Pending Reaction Rolls",
                 "openSheetSettings": "Open Settings"
->>>>>>> main
             }
         }
     }
diff --git a/styles/less/global/chat.less b/styles/less/global/chat.less
index 27a29c1d..1e37309d 100644
--- a/styles/less/global/chat.less
+++ b/styles/less/global/chat.less
@@ -44,6 +44,7 @@
                     align-items: center;
                     gap: 8px;
                     flex: 1;
+                    overflow: hidden;
 
                     .actor-img {
                         border-radius: 50%;