diff --git a/src/views/chart/ContentEdit/components/EditRange/index.vue b/src/views/chart/ContentEdit/components/EditRange/index.vue
index 0c6ae35b..81944bd6 100644
--- a/src/views/chart/ContentEdit/components/EditRange/index.vue
+++ b/src/views/chart/ContentEdit/components/EditRange/index.vue
@@ -55,10 +55,6 @@ const rangeModelStyle = computed(() => {
   position: relative;
   transform-origin: left top;
   background-size: cover;
-<<<<<<< HEAD
-  border-radius: 10px;
-=======
->>>>>>> dev
   overflow: hidden;
   @include fetch-border-color('hover-border-color');
   @include fetch-bg-color('background-color2');
diff --git a/src/views/chart/ContentEdit/components/EditSelect/index.vue b/src/views/chart/ContentEdit/components/EditSelect/index.vue
index bc4ccd0c..5526e8ed 100644
--- a/src/views/chart/ContentEdit/components/EditSelect/index.vue
+++ b/src/views/chart/ContentEdit/components/EditSelect/index.vue
@@ -93,33 +93,20 @@ watch(
     position: absolute;
     width: 100%;
     height: 100%;
-<<<<<<< HEAD
-    border-radius: 5px;
-=======
->>>>>>> dev
     overflow: hidden;
   }
   .select-border {
     left: 0;
     top: 0;
-<<<<<<< HEAD
-    opacity: 0.5;
-    border-width: 2px;
-=======
     opacity: 1;
     border-width: 1px;
->>>>>>> dev
     border-style: solid;
     border-color: v-bind('themeColor');
   }
   .select-background {
     top: 2px;
     left: 2px;
-<<<<<<< HEAD
-    opacity: 0.2;
-=======
     opacity: 0.08;
->>>>>>> dev
     background-color: v-bind('themeColor');
   }
 }
diff --git a/src/views/chart/ContentEdit/components/EditShapeBox/index.vue b/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
index 18318108..e42c5e23 100644
--- a/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
+++ b/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
@@ -139,11 +139,7 @@ const hide = computed(() => {
       position: absolute;
       width: 100%;
       height: 100%;
-<<<<<<< HEAD
-      border-radius: 10px;
-=======
       border-radius: 4px;
->>>>>>> dev
     }
 
     .shape-modal-select {
diff --git a/src/views/chart/ContentEdit/components/EditTools/index.vue b/src/views/chart/ContentEdit/components/EditTools/index.vue
index 349e2e18..c92e578c 100644
--- a/src/views/chart/ContentEdit/components/EditTools/index.vue
+++ b/src/views/chart/ContentEdit/components/EditTools/index.vue
@@ -182,21 +182,13 @@ const btnList: BtnListType[] = [
     key: 'import',
     type: TypeEnum.IMPORTUPLOAD,
     name: '导入',
-<<<<<<< HEAD
     icon: ShareIcon
-=======
-    icon: DownloadIcon
->>>>>>> dev
   },
   {
     key: 'export',
     type: TypeEnum.BUTTON,
     name: '导出',
-<<<<<<< HEAD
     icon: DownloadIcon,
-=======
-    icon: ShareIcon,
->>>>>>> dev
     handle: exportHandle
   },
   {
@@ -239,11 +231,8 @@ $asideBottom: 70px;
   border: 1px solid;
   @include fetch-border-color('hover-border-color-shallow');
   &.aside {
-<<<<<<< HEAD
-=======
     display: flex;
     justify-content: center;
->>>>>>> dev
     flex-direction: column-reverse;
     height: auto;
     right: 20px;
diff --git a/src/views/chart/ContentEdit/index.vue b/src/views/chart/ContentEdit/index.vue
index ef5caaa9..b0e8dddb 100644
--- a/src/views/chart/ContentEdit/index.vue
+++ b/src/views/chart/ContentEdit/index.vue
@@ -193,10 +193,6 @@ onMounted(() => {
   @include background-image('background-point');
 
   @include goId('chart-edit-content') {
-<<<<<<< HEAD
-    border-radius: 10px;
-=======
->>>>>>> dev
     overflow: hidden;
     @extend .go-transition;
     @include fetch-theme('box-shadow');