diff --git a/hello.txt b/hello.txt
index 8d0e41234f24b6da002d962a26c2495ea16a425f..9b94ced88dc7c971af9bbb8cb1a977d6e5a5440e 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 hello git
+and
+hello WEB
+>>>>>>> f618069bfaae1e35814059d03b15d0b5a623c134