diff --git a/hello.py b/hello.py
index 54793726f76159b4d9a151b58fc38c3e2242b85d..ba491437d261f1269251b5d40442ceefc95b7c4b 100644
--- a/hello.py
+++ b/hello.py
@@ -1 +1,5 @@
+<<<<<<< hello.py
+print("Hello World")
+print("Iam feeling happy today")
 print("Hello Shyam") 
+>>>>>>> hello.py