From c7c8fef8eb7ee7f4bb7c1fbcf501d8fd96213c1f Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Wed, 26 Aug 2026 11:29:28 -0700
Subject: [PATCH] fix merge conflicts

---
 .../TerminalSettingsEditor/Resources/en-US/Resources.resw     | 4 ----
 src/cascadia/TerminalSettingsEditor/SearchIndex.cpp           | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index bb21db6a27..69c75598d6 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -1097,10 +1097,6 @@
     <value>Hide profile from dropdown</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.Description" xml:space="preserve">
-    <value>If enabled, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamically generated profiles, while leaving them in your settings file.</value>
-    <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
-  </data>
   <data name="Profile_HiddenBadge.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Hidden from the dropdown menu</value>
     <comment>Tooltip shown when hovering the InfoBadge next to a profile name on the Profiles landing page when that profile is hidden from the dropdown menu.</comment>
diff --git a/src/cascadia/TerminalSettingsEditor/SearchIndex.cpp b/src/cascadia/TerminalSettingsEditor/SearchIndex.cpp
index 67c5769cb3..014d3a9456 100644
--- a/src/cascadia/TerminalSettingsEditor/SearchIndex.cpp
+++ b/src/cascadia/TerminalSettingsEditor/SearchIndex.cpp
@@ -254,10 +254,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 LocalizedIndexEntry localizedEntry;
                 localizedEntry.Entry = &entry;
                 localizedEntry.DisplayTextLocalized = GetLibraryResourceString(entry.ResourceName);
-                if (!entry.SecondaryResourceName.empty())
-                {
-                    localizedEntry.SecondaryLabelLocalized = GetLibraryResourceString(entry.SecondaryResourceName);
-                }
                 if (shouldIncludeLanguageNeutralResources)
                 {
                     localizedEntry.DisplayTextNeutral = EnglishOnlyResourceLoader().GetLocalizedString(entry.ResourceName);