diff --git a/hello.txt b/hello.txt
index 55b4556662c30ec2f6c2118edd44eb6e0aeff793..312583e1e707d2fee7b8066b0d51c97567d14f60 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,2 +1,6 @@
 hello
+<<<<<<< HEAD
 IN PC
+=======
+Web Modify
+>>>>>>> d3dc4e74ac5c7e10c4d29f08bd29e5eab6043e17