From 7cbbbe1630db0e4edeeb11a8af42b4012b766379 Mon Sep 17 00:00:00 2001
From: enkeii64 <imenkei64@gmail.com>
Date: Thu, 17 Jul 2025 00:07:39 +1000
Subject: [PATCH] fix: resolve merge conflict in draggable-item.tsx

---
 apps/web/src/components/ui/draggable-item.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/components/ui/draggable-item.tsx b/apps/web/src/components/ui/draggable-item.tsx
index 6e1e4990..2af7932a 100644
--- a/apps/web/src/components/ui/draggable-item.tsx
+++ b/apps/web/src/components/ui/draggable-item.tsx
@@ -158,7 +158,7 @@ function PlusButton({
   onClick?: () => void;
   tooltipText?: string;
 }) {
-  return (
+  const button = (
     <Button
       size="icon"
       className={cn("absolute bottom-2 right-2 size-4", className)}
@@ -172,4 +172,6 @@ function PlusButton({
       <Plus className="!size-3" />
     </Button>
   );
+
+  return button;
 }