From b23502c32b8b3c136e9d3b20c63cf1f32f4dbe49 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sat, 23 Dec 2023 15:56:28 -0500
Subject: [PATCH] Fix incorrect merge

---
 .../bugfix/buffer_builder_leak/BufferBuilderMixin.java      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/buffer_builder_leak/BufferBuilderMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/buffer_builder_leak/BufferBuilderMixin.java
index 82509167..432e9117 100644
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/buffer_builder_leak/BufferBuilderMixin.java
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/buffer_builder_leak/BufferBuilderMixin.java
@@ -42,11 +42,7 @@ public class BufferBuilderMixin {
         try {
             ByteBuffer buf = buffer;
             // can be null if a mod already tried to free the buffer
-<<<<<<< HEAD
-            if(!this.closed && buf != null) {
-=======
-            if(buf != null && mfix$shouldFree) {
->>>>>>> propagations/1.20
+            if(!this.closed && buf != null && mfix$shouldFree) {
                 if(!leakReported) {
                     leakReported = true;
                     ModernFix.LOGGER.warn("One or more BufferBuilders have been leaked, ModernFix will attempt to correct this.");