From e542861ca6914121f7cafb4ff810816ab40bbf8d Mon Sep 17 00:00:00 2001
From: Bishop <bishop@airmail.cc>
Date: Fri, 24 Jul 2026 11:15:40 -0500
Subject: [PATCH] Merge conflict resolution attempt

---
 .../src/main/content/global/skill/construction/HouseZone.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Server/src/main/content/global/skill/construction/HouseZone.java b/Server/src/main/content/global/skill/construction/HouseZone.java
index 1923e4f66..c256d1068 100644
--- a/Server/src/main/content/global/skill/construction/HouseZone.java
+++ b/Server/src/main/content/global/skill/construction/HouseZone.java
@@ -1,6 +1,7 @@
 package content.global.skill.construction;
 
 
+import content.global.skill.construction.decoration.workshop.WorkbenchListeners;
 import core.api.Container;
 import core.game.world.map.Location;
 import core.net.packet.PacketRepository;
@@ -15,7 +16,6 @@ import core.game.world.map.Region;
 import core.game.system.task.Pulse;
 import core.game.world.map.zone.ZoneType;
 
-import content.global.skill.construction.decoration.workshop.WorkbenchListeners;
 import static core.api.ContentAPIKt.*;
 
 /**