diff --git a/__init__.py b/__init__.py
index 610f6ac..bca32b3 100644
--- a/__init__.py
+++ b/__init__.py
@@ -124,14 +124,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
 
    #文件处理：meyo_node_File
    "LoadAndAdjustImage": "加载重置图像🐠meeeyo.com",
-<<<<<<< HEAD
    "GenericImageLoader": "全能加载图像🐠meeeyo.com",
-=======
-<<<<<<< HEAD
-   "GenericImageLoader": "全能加载图像🐠meeeyo.com",
-=======
->>>>>>> 79ed250c5d0d1f11fccbec9087431ff25fc1e810
->>>>>>> f14d0c29f81a549b32997f82e610ad71cdb4404c
    "ImageAdjuster": "重置图像🐠meeeyo.com",
    "CustomCrop": "裁剪图像🐠meeeyo.com",
    "SaveImagEX": "保存图像🐠meeeyo.com",