diff --git a/git.txt b/git.txt
index 8216c7c..67bb44d 100644
--- a/git.txt
+++ b/git.txt
@@ -1,8 +1,6 @@
 git show
 111
-<<<<<<< HEAD
 333
-=======
 222
->>>>>>> 3ad949782ad2b22ac1b9cef7521ec0506c2e6ea7
+