diff --git a/src/views/privateOrder/security/components/componentRight.vue b/src/views/privateOrder/security/components/componentRight.vue
index 65c8a37..98236c9 100644
--- a/src/views/privateOrder/security/components/componentRight.vue
+++ b/src/views/privateOrder/security/components/componentRight.vue
@@ -232,11 +232,7 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import { safeRisks } from "@/api/wlSafe";
-=======
 import {safeRisks,tbFinish} from '@/api/wlSafe'
->>>>>>> 2fc8ba4145509fb4617499e6b82e9046877addd8
 import { listDanger, getDanger, listTb, getTb } from "@/api/zongzhi/st.js";
 import vueSeamlessScroll from "vue-seamless-scroll";
 import ModuleTitle from "../../common/ModuleTitle.vue";