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