diff --git a/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue b/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
index 7cda7a013..6f5729c9b 100644
--- a/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
@@ -214,12 +214,8 @@ export default {
   display: inline-block;
 }
 .tree {
-<<<<<<< HEAD
   overflow:auto;
   height: calc(100% - 52px);
-=======
-  overflow: auto;
   max-height: 600px;
->>>>>>> master
 }
 </style>
\ No newline at end of file