diff --git a/src/views/bigScreen/enpComponents/pollutant2.vue b/src/views/bigScreen/enpComponents/pollutant2.vue
index 2c268057..e555b5ab 100644
--- a/src/views/bigScreen/enpComponents/pollutant2.vue
+++ b/src/views/bigScreen/enpComponents/pollutant2.vue
@@ -44,11 +44,7 @@
                     <el-container>
                         <el-header class="panel_title">
                             <div class="left-panel">
-<<<<<<< HEAD
-                                <div>污染源监测详情</div>
-=======
                                 污染源监测详情
->>>>>>> 6e7b2a9f570674e46f2c9a15c01cc2183c3a3150
                             </div>
                             <div class="right-panel">
                                 <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"