diff --git a/src/components/OverlayModal.vue b/src/components/OverlayModal.vue
index ccc67cb..0063206 100644
--- a/src/components/OverlayModal.vue
+++ b/src/components/OverlayModal.vue
@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
     <div v-if="visible" class="overlay">
         <div class="overlay_modal" >
           <slot></slot>
@@ -8,28 +7,10 @@
 </template>
 <script lang="ts" setup>
     defineProps({
-=======
-    <van-overlay :show="visible" style="z-index: 999;">
-        <div class="overlay_modal" >
-          <slot></slot>
-        </div>
-      </van-overlay>
-</template>
-<script lang="ts" setup>
-    import { ref, onMounted, watch } from "vue"
-    const emits = defineEmits(['confirm', 'changeVisible'])
-
-    const props = defineProps({
-        title:{
-            type: String,
-            default: ''
-        },
->>>>>>> d371cd3 (完善溶液配置页面)
         visible:{
             type: Boolean,
             default: false
         },
-<<<<<<< HEAD
     })
 </script>
 <style scoped>
@@ -42,36 +23,6 @@
         left: 0px;
         z-index: 999
     }
-=======
-        list:{
-            type: Array,
-            default: ()=>[]
-        },
-        width:{
-            type:String,
-            default:'32rem'
-        },
-        height:{
-            type:String,
-            default:'25rem'
-        },
-        item:{
-            type: Object
-        }
-    })
-
-    const columnsList = ref<any>(props.list)
-
-    const onSubmit = () => {
-        emits('confirm')
-    }
-
-    const onCancel = ()=> {
-        emits("changeVisible", false)
-    }
-</script>
-<style scoped>
->>>>>>> d371cd3 (完善溶液配置页面)
     .overlay_modal{
         display: flex;
         justify-content: center;
diff --git a/src/views/addLiquid/index.vue b/src/views/addLiquid/index.vue
index 4ad1074..e013f46 100644
--- a/src/views/addLiquid/index.vue
+++ b/src/views/addLiquid/index.vue
@@ -148,11 +148,7 @@
                 position: relative;
                 width: 5.125rem;
                 height: 7.25rem;
-<<<<<<< HEAD
                 margin-top: 1.125rem;
-=======
-                margin-top: 36px;
->>>>>>> d371cd3 (完善溶液配置页面)
                 margin-left: 3.75rem;
                 display: flex;
                 justify-content: center;
diff --git a/src/views/graphite/components/HeatPosition.vue b/src/views/graphite/components/HeatPosition.vue
index d5b1fbb..ef47d01 100644
--- a/src/views/graphite/components/HeatPosition.vue
+++ b/src/views/graphite/components/HeatPosition.vue
@@ -100,7 +100,6 @@
     const trayInfo = ref(props.heatInfo || {})
     const trayTempVale = ref(trayInfo.value.trayTempVale || '')
     const formulaList:any = ref([])
-<<<<<<< HEAD
 
     //选中托盘
     const isSelect = ref(false)
@@ -116,12 +115,6 @@
         
         emits("onSelectedTray", props.heatInfo)
         
-=======
-    const onChooseFormula = () => {
-      formulaVisible.value = true;
-      formulaList.value = [{ text: '硫酸', value: '1' }]
-      formulaList.value.push({ text: '硫酸', value: '1' })
->>>>>>> d371cd3 (完善溶液配置页面)
     }
 
 
diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue
index e9529ca..2226aa4 100644
--- a/src/views/graphite/index.vue
+++ b/src/views/graphite/index.vue
@@ -27,26 +27,15 @@
                     </van-col>
                 </van-row>
                 <van-row class="graphite_operate">
-<<<<<<< HEAD
                     <van-col class="w-56">
                         <van-button  size="large" class="btn_size" @click="onChooseCaft">选择工艺</van-button>
                     </van-col>
                     <van-col class="w-[13.5rem]">
-=======
-                    <van-col span="11">
-                        <van-button  size="large" class="btn_size" @click="onChooseCaft">选择工艺</van-button>
-                    </van-col>
-                    <van-col span="11">
->>>>>>> d371cd3 (完善溶液配置页面)
                         <van-button  size="large" class="btn_size">执行工艺</van-button>
                     </van-col>
                 </van-row>
                 <van-row class="graphite_operate">
-<<<<<<< HEAD
                     <van-col class="w-56">
-=======
-                    <van-col span="11">
->>>>>>> d371cd3 (完善溶液配置页面)
                         <van-button  size="large" class="btn_size" @click="onAddLiquid">添加溶液</van-button>
                     </van-col>
                     <van-col class="w-[13.5rem]">
@@ -83,18 +72,12 @@
             </div>
         </van-overlay>
         <!--选择工艺-->
-<<<<<<< HEAD
         <OverlayModal :visible="craftVisible">
             <CraftList @changeVisible="changeVisible"></CraftList>
-=======
-        <OverlayModal :visible="carfVisible">
-            <CarfList @changeVisible="changeVisible"></CarfList>
->>>>>>> d371cd3 (完善溶液配置页面)
         </OverlayModal>
     </div>
 </template>
 <script lang="ts" setup>
-<<<<<<< HEAD
     import { ref, onMounted } from 'vue';
     import {HeatPosition, TakePickture, AddLiquid} from './components'
     import OverlayModal from '@/components/OverlayModal.vue';
@@ -120,14 +103,6 @@
         console.log('selectedTrayList.value--', selectedTrayList.value)
     }
     
-=======
-    import { ref } from 'vue';
-    import {HeatPosition, TakePickture, AddLiquid} from './components'
-    import OverlayModal from '@/components/OverlayModal.vue';
-    import CarfList from './components/CarfList.vue';
-    const heatList:any = ref([1,2,3,4,5,6])
-    const carfVisible = ref(false)
->>>>>>> d371cd3 (完善溶液配置页面)
     //添加溶液
     const liquidVisible = ref(false)
     const onAddLiquid = () => {
@@ -135,19 +110,11 @@
     }
 
     const changeVisible = () => {
-<<<<<<< HEAD
         craftVisible.value = false;
     }
     //选择工艺
     const onChooseCaft = () => {
         craftVisible.value = true;
-=======
-        carfVisible.value = false;
-    }
-    //选择工艺
-    const onChooseCaft = () => {
-        carfVisible.value = true;
->>>>>>> d371cd3 (完善溶液配置页面)
     }
 </script>
 <style lang="scss" scoped>