diff --git a/hello.txt b/hello.txt
index 9b94ced88dc7c971af9bbb8cb1a977d6e5a5440e..fdd514386dc7b567a0d52e68ba48bf0490b118a6 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-hello git
-and
-hello WEB
->>>>>>> f618069bfaae1e35814059d03b15d0b5a623c134
+modift in branch
\ No newline at end of file