diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index f0fb79e45..a9931673b 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -853,13 +853,9 @@
         </el-button>
         <el-upload
           :before-upload="importJson"
-<<<<<<< HEAD
-=======
           :show-file-list="false"
->>>>>>> main
           accept=".json"
           class="flex items-center"
-          show-file-list="false"
         >
           <el-button class="mx-2" type="primary" :disabled="isAdd">{{
             t('view.systemTools.autoCode.importJson')