diff --git a/hello.py b/hello.py
index 339f954a527e7ffb75b6496f66854cd4a147c6c3..ba491437d261f1269251b5d40442ceefc95b7c4b 100644
--- a/hello.py
+++ b/hello.py
@@ -1,2 +1,5 @@
+<<<<<<< hello.py
 print("Hello World")
-print("Iam feeling happy today")
\ No newline at end of file
+print("Iam feeling happy today")
+print("Hello Shyam") 
+>>>>>>> hello.py