Fix merge conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
index 57857aea5..c95f474f4 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
@@ -193,10 +193,10 @@ public abstract class AbstractEntryStack<A> implements EntryStack<A>, Renderer {
                 }
             } else {
                 final String modName = ClientHelper.getInstance().getModFromModId(location.getNamespace());
-                Iterator<Tooltip.Entry> iterator = tooltip.getValue().entries().iterator();
+                Iterator<Component> iterator = tooltip.getValue().getText().iterator();
                 while (iterator.hasNext()) {
-                    Tooltip.Entry s = iterator.next();
-                    if (s.isText() && FormattingUtils.stripFormatting(s.getAsText().getString()).equalsIgnoreCase(modName)) {
+                    Component s = iterator.next();
+                    if (FormattingUtils.stripFormatting(s.getString()).equalsIgnoreCase(modName)) {
                         iterator.remove();
                     }
                 }