diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index a7cf3e92..a461607e 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -19,7 +19,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {
diff --git a/pages.json b/pages.json
index ca5c39a6..2c6690d2 100644
--- a/pages.json
+++ b/pages.json
@@ -2506,17 +2506,10 @@
 			}
 		},
 		{
-<<<<<<< HEAD
 			"path": "pages/projectEnd/trainPlan/searchTeam/personList",
 			"style": {
-				"navigationBarTitleText": ""
-=======
-			"path" : "pages/projectEnd/trainPlan/searchTeam/personList",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
+				"navigationBarTitleText": "",
 				"onReachBottomDistance": 100
->>>>>>> 8d4c6f69b5f932e4842d3f9ddd13043de9837210
 			}
 		},
 		{
diff --git a/pages/submit/submit.vue b/pages/submit/submit.vue
index 0a4995ca..0cc4d8e3 100644
--- a/pages/submit/submit.vue
+++ b/pages/submit/submit.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="fullHeight">
-		<levitatedsphere id="levitatedsphere" :x="100" :y="80"></levitatedsphere>
+		<!-- <levitatedsphere id="levitatedsphere" :x="100" :y="80"></levitatedsphere> -->
 		<view>
 			<!-- :webview-styles="styles" -->
 			<web-view class="webView" :src="work_url" :fullscreen="false" @onPostMessage="handlePostMessage">