diff --git a/Hello.py b/Hello.py
index 37a4aa5be987106061b0a1e09ef3a3afa1257f89..03e85f7802f88a8fe5336a949b59197899cf269a 100644
--- a/Hello.py
+++ b/Hello.py
@@ -1,32 +1,6 @@
+<<<<<<< Hello.py
 print("Hello World") 
 print("I am feeling happy today")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+print("Hello World, Miri")
+>>>>>>> Hello.py