diff --git a/Project/ItemTool/ItemFusion/ItemFusion.nut b/Project/ItemTool/ItemFusion/ItemFusion.nut
index 3ed5f41..ec24e9b 100644
--- a/Project/ItemTool/ItemFusion/ItemFusion.nut
+++ b/Project/ItemTool/ItemFusion/ItemFusion.nut
@@ -16,8 +16,12 @@ class ItemFusionC_ItemSlot extends LenheartNewUI_ItemSlot {
     HoverFlag = false;
 
 
+<<<<<<< HEAD
     constructor(X, Y, Index) {
         MyIndex = Index;
+=======
+    constructor(X, Y) {
+>>>>>>> a11458d226ec41caa22d30b6d76893362389e3e1
         LenheartNewUI_ItemSlot.constructor(X, Y);
     }
 
@@ -81,7 +85,7 @@ class ItemFusionC extends LenheartNewUI_Windows {
     // NoWindow = true;
 
     //是否可见
-    Visible = false;
+    // Visible = false;
 
     Slot = null;
 
@@ -195,7 +199,11 @@ class ItemFusionC extends LenheartNewUI_Windows {
         AddChild(ConfirmButton);
 
         //创建槽
+<<<<<<< HEAD
         Slot = [ItemFusionC_ItemSlot(58, 68, 0), ItemFusionC_ItemSlot(159, 68, 1), ItemFusionC_ItemSlot(108, 192, 2)];
+=======
+        Slot = [ItemFusionC_ItemSlot(58, 68), ItemFusionC_ItemSlot(159, 68), ItemFusionC_ItemSlot(108, 192)];
+>>>>>>> a11458d226ec41caa22d30b6d76893362389e3e1
         foreach(value in Slot) {
             AddChild(value);
         }