diff --git a/README.md b/README.md
index 4db8152..d06e0be 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 # GateWay
 
-一代网关
\ No newline at end of file
+一代网关
+=======
+# LaserTracing_Debug
+
+>>>>>>> aaff1aeec5ea03de83eee8888e10da1bf6a62ded