diff --git a/hello.txt b/hello.txt
index a0cf6bf3b974f4e7915bb17f19063ae4c7c56bbb..79367d78712147d983a77fcb66811e2255c78d95 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,7 +1,3 @@
 hello
-<<<<<<< HEAD
 IN PC
-=======
-Web Modify
->>>>>>> d3dc4e74ac5c7e10c4d29f08bd29e5eab6043e17
 modify in develop
\ No newline at end of file