diff --git a/src/main/java/net/shadow/client/feature/module/impl/render/BlockHighlighting.java b/src/main/java/net/shadow/client/feature/module/impl/render/BlockHighlighting.java
index e188ef3..1ede93a 100644
--- a/src/main/java/net/shadow/client/feature/module/impl/render/BlockHighlighting.java
+++ b/src/main/java/net/shadow/client/feature/module/impl/render/BlockHighlighting.java
@@ -15,7 +15,6 @@ import net.minecraft.util.shape.VoxelShape;
 import net.shadow.client.ShadowMain;
 import net.shadow.client.feature.module.Module;
 import net.shadow.client.feature.module.ModuleType;
-<<<<<<< HEAD:src/main/java/net/shadow/client/feature/module/impl/render/BlockHighlighting.java
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket;
 import net.minecraft.network.packet.s2c.play.BlockEventS2CPacket;
@@ -23,8 +22,6 @@ import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket;
 import net.shadow.client.helper.event.EventType;
 import net.shadow.client.helper.event.Events;
 import net.shadow.client.helper.event.events.PacketEvent;
-=======
->>>>>>> ded843d309829ef17bfd65c24b2c2338f4db5b3b:src/main/java/net/shadow/client/feature/module/impl/render/BetterBlockBreaking.java
 import net.shadow.client.helper.render.Renderer;
 import net.shadow.client.helper.util.Utils;
 import net.shadow.client.mixin.WorldRendererAccessor;