diff --git a/hello.txt b/hello.txt
index 3d32ae56a789c04c7d918b507e07494490ff5ea2..97128406c8f813b4cc39e4691bcc2dbcf5fc8427 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,7 +1,12 @@
 hello world
 <<<<<<< HEAD
 in git
-=======
+======dfsfsdffddf=
+i
 web
 >>>>>>> 53ed6f61209f7d77b77b3d2df0704090117fcc3b
-i'm branch2
+fdfdfdf
+dfdf
+df
+sdf
+di'm branch2