diff --git a/Hello.py b/Hello.py
index e6c74019fc6fdd823f625b03e9e3f8ab9a2ffb14..6f61e087cf9bb535cba3e7673bc870f6c5d3cfbc 100644
--- a/Hello.py
+++ b/Hello.py
@@ -1 +1,6 @@
-print("Hello World, I am feeling Happy")
+<<<<<<< Hello.py
+
+=======
+print("Hello World, Thomas")
+print("I am feeling Happy")
+>>>>>>> Hello.py