diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js
index 86685ce6d..53537ba3e 100644
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@@ -277,7 +277,12 @@ class Index extends Component {
     const { current_user } = this.props;
 
     const { projectsList , recommendList , languageList , languageId , 
+<<<<<<< HEAD
       isSpin, total, search, limit, page, typeList, CategoryList  , category_id , recommendOriList } = this.state;
+=======
+      isSpin, total, search, limit, page, typeList, categoryList , 
+      recommendOriList , CategoryList , category_id } = this.state;
+>>>>>>> 721fe6679 (explore/all 筛选)
 
       const setting={
         dots: true,