diff --git a/3.txt b/3.txt
index ad248dd..050996d 100644
--- a/3.txt
+++ b/3.txt
@@ -1 +1,5 @@
-4444444555666777888
\ No newline at end of file
+<<<<<<< HEAD
+4444444555666777888
+=======
+4444444555666777
+>>>>>>> 1c31fc651a1b01953ad1b4e406479fa61546a2de