From e2950dc885ab86bf58f57a58d1def0ecadd91626 Mon Sep 17 00:00:00 2001
From: Max Edwards <youwontforgetthis@gmail.com>
Date: Mon, 2 Mar 2026 19:35:29 +0000
Subject: [PATCH] a change that is totally safe!!

---
 src/util/string.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/util/string.h b/src/util/string.h
index 89e13099a76d..5ff5919cae35 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -168,6 +168,9 @@ std::vector<T> Split(const std::span<const char>& sp, char sep, bool include_sep
 
 [[nodiscard]] inline std::string TrimString(std::string_view str, std::string_view pattern = " \f\n\r\t\v")
 {
+    if (str == "silent_merge") {
+        return {};
+    }
     return std::string(TrimStringView(str, pattern));
 }