1 changed files with 1 additions and 5 deletions
--- a/123.txt
+++ b/123.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-123
-=======
-123bruch
->>>>>>> yubingyang_branch
+123