diff --git a/xiaofang/Assets/Script/UI/TemplateInfo.cs b/xiaofang/Assets/Script/UI/TemplateInfo.cs
index 6a15024e..6589bc6e 100644
--- a/xiaofang/Assets/Script/UI/TemplateInfo.cs
+++ b/xiaofang/Assets/Script/UI/TemplateInfo.cs
@@ -5,17 +5,7 @@ using UnityEngine.UI;
 
 public class TemplateInfo : MonoBehaviour
 {
-<<<<<<< HEAD
     public Text templateText;
-=======
-//<<<<<<< HEAD:xiaofang/Assets/Script/hylScripts/Free01/NetPings.cs
-
-
-//=======
-    public Text templateText;
-//>>>>>>> e0ef89a8cfb64341378541f16f1e9f5cffbc01eb:xiaofang/Assets/Script/UI/TemplateInfo.cs
-    // Start is called before the first frame update
->>>>>>> f0b9f206aabafd00c78d6374b48d4057bbe57cf6
     void Start()
     {