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