diff --git a/2.txt b/2.txt
index 6c2eab4..d069baf 100644
--- a/2.txt
+++ b/2.txt
@@ -2,5 +2,6 @@
 456455
 789461665
 sssssssssss
+<<<<<<< HEAD
 dddddd
-tttttttttt
\ No newline at end of file
+mmmmmmm
\ No newline at end of file