diff --git a/src/components/Search/Index.vue b/src/components/Search/Index.vue
index 9e46620..fac4e9f 100644
--- a/src/components/Search/Index.vue
+++ b/src/components/Search/Index.vue
@@ -41,11 +41,7 @@ function handleSearchActino() {
 .search-container {
   :deep(.van-search) {
     padding: 0;
-<<<<<<< Updated upstream
-    margin: 0 -10px;
-=======
     //margin: 0 10px;
->>>>>>> Stashed changes
     border-radius: 0;
     background-color: #fff;
   }
@@ -76,13 +72,8 @@ function handleSearchActino() {
   }
 
   border-radius: 18px;
-<<<<<<< Updated upstream
-  border: solid 2px #70b937;
-  background-color: #f5f5f5;
-=======
   border: solid 1px var(--primary-color);
   background-color: #fff;
->>>>>>> Stashed changes
 
   //width: 100vw;
   display: grid;
diff --git a/src/views/Survey/components/SurveyItem.vue b/src/views/Survey/components/SurveyItem.vue
index bc75b66..984b0b5 100644
--- a/src/views/Survey/components/SurveyItem.vue
+++ b/src/views/Survey/components/SurveyItem.vue
@@ -283,22 +283,13 @@ function copyItem(item: SurveyItem) {
       }
     }
 
-<<<<<<< Updated upstream
     .wrap {
       margin-left: 5px;
       padding: 1px 3px;
-      border: 2px solid #f5f5f5;
-      border-radius: 6px;
-      font-size: 12px;
-      text-wrap: nowrap;
-=======
-    & > :nth-child(2) {
-      position: relative;
-      left: 9px;
-      padding: 0 4px;
       border: 0.5px solid rgba(192,192,192,0.35);
       border-radius: 6px;
       font-size: 12px;
+      text-wrap: nowrap;
       color: #333333;
     }
     & > :nth-child(3) {
@@ -306,9 +297,8 @@ function copyItem(item: SurveyItem) {
       border-radius: 6px;
       font-size: 12px;
       color: #333333;
-      margin-left: 17px;
+      margin-left: 7px;
       border: 0.5px solid rgba(192,192,192,0.35);
->>>>>>> Stashed changes
     }
   }
 
@@ -323,11 +313,6 @@ function copyItem(item: SurveyItem) {
     text-overflow: ellipsis;
     padding: 14px 30px;
     box-sizing: border-box;
-<<<<<<< Updated upstream
-    margin: 0 10px 10px 5px;
-=======
-    //margin: 0 10px 10px 10px;
->>>>>>> Stashed changes
     color: #828282;
     //font-weight: 400;
     font-size: 12px;