Fixing merge

src/main/java/io/github/darkkronicle/advancedchathud/mixin/MixinChatHud.java

@@ -21,12 +21,16 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.ChatHud;
 import net.minecraft.client.gui.hud.ChatHudLine;
 import net.minecraft.client.util.ChatMessages;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = ChatHud.class, priority = 1050)
 @Environment(EnvType.CLIENT)
@@ -101,6 +105,11 @@ public abstract class MixinChatHud implements IChatHud {
         return tab;
     }
 
+    @Inject(at = @At("HEAD"), method = "render", cancellable = true)
+    private void render(MatrixStack stack, int delta, CallbackInfo ci) {
+        ci.cancel();
+    }
+
     public void setTab(AbstractChatTab tab) {
         this.tab = tab;
         this.messages.clear();