diff --git a/src/views/supervision_test_blocks_specimens/index.vue b/src/views/supervision_test_blocks_specimens/index.vue
index f425b03..2f70693 100644
--- a/src/views/supervision_test_blocks_specimens/index.vue
+++ b/src/views/supervision_test_blocks_specimens/index.vue
@@ -102,13 +102,8 @@
 <script lang="ts" setup name="supervisionTestBlocksSpecimensLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-<<<<<<< HEAD
-import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete, apiSupervisionTestBlocksSpecimensDetail } from '@/api/supervision_test_blocks_specimens'
-import { timeFormat } from '@/utils/util'
-=======
 import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete } from '@/api/supervision_test_blocks_specimens'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
->>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'