diff --git a/hello2.txt b/hello2.txt
index 47f3bfd7c169f1f14aa1ac5f006421f5bc029134..09c0464f11f453ef48ef38b0a7fb28fc434ee8c1 100644
--- a/hello2.txt
+++ b/hello2.txt
@@ -1 +1,3 @@
 pleasemidify in pc
+please
+lululala>>>>>>> b4004cdf6b409d18a5fb84f83d4aae6e04fc0407