diff --git a/3.txt b/3.txt
index d1d06ad..27d6728 100644
--- a/3.txt
+++ b/3.txt
@@ -1 +1,5 @@
-1111
\ No newline at end of file
+<<<<<<< HEAD
+1111
+=======
+3333
+>>>>>>> 8dcf2c2 (3)