diff --git a/hello.py b/hello.py
index da3d0b235ed44686630584a0da63a98d2dca9025..e783946acb329abc42a82a1cb3dda769d3fda92c 100644
--- a/hello.py
+++ b/hello.py
@@ -1,3 +1,5 @@
-print("Hello World")
+<<<<<<< hello.py
+print("Hello World, Abhi")
 print("I am feeling happy today")
+>>>>>>> hello.py