diff --git a/123.txt b/123.txt
index 1eb9317..5d75899 100644
--- a/123.txt
+++ b/123.txt
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
+123main
 123
-=======
-123bruch
->>>>>>> yubingyang_branch