diff --git a/HeBoSuo_51.uproject b/HeBoSuo_51.uproject
index 10712d58..e18c221e 100644
--- a/HeBoSuo_51.uproject
+++ b/HeBoSuo_51.uproject
@@ -100,17 +100,8 @@
 			]
 		},
 		{
-<<<<<<< HEAD
-			"Name": "SteamVR",
-			"Enabled": true,
-			"SupportedTargetPlatforms": [
-				"Win64",
-				"Linux"
-			]
-=======
 			"Name": "Text3D",
 			"Enabled": true
->>>>>>> b2f728d9235a46ad62d5e7c7de21eb82ae37a1ca
 		}
 	]
 }
\ No newline at end of file