diff --git a/git.txt b/git.txt
index 0b4c76d..f86b67f 100644
--- a/git.txt
+++ b/git.txt
@@ -1,4 +1,8 @@
 git show
 111
+<<<<<<< HEAD
 222
+=======
+333
+>>>>>>> a-branch