diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index ac0fdd3..ff42826 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -79,7 +79,6 @@
                 :label="item.label"
                 :value="item.value">
               </el-option>
-<<<<<<< HEAD
             </el-select>
           </el-form-item>
           <el-form-item label="指导书内容" prop="instruction_content">