diff --git a/src/views/projectAdmin/jlw/CIM/index.vue b/src/views/projectAdmin/jlw/CIM/index.vue
index 9542b1e6..0d99eb6b 100644
--- a/src/views/projectAdmin/jlw/CIM/index.vue
+++ b/src/views/projectAdmin/jlw/CIM/index.vue
@@ -96,7 +96,6 @@ export default {
 .container {
   width: 100%;
   height: 100%;
-<<<<<<< HEAD
   display: flex;
   justify-content: space-between;
   .charts {
@@ -108,26 +107,6 @@ export default {
     .chart {
       height: 32%;
     }
-=======
-  background-color: #07162b;
-  background-image: url('~@/assets/images/projectImg/Bimbgc.png');
-}
-.topBox {
-  height: 20%;
-}
-.leftBox {
-  position: relative;
-  width: 25%;
-  height: 100%;
-  margin-right: 15px;
-  .leftTop {
-    height: 33%;
-    margin-bottom: 15px;
-  }
-  .leftCenter {
-    height: 33%;
-    margin-bottom: 15px;
->>>>>>> dev-xiaole
   }
   .bim {
     padding: 8px;