diff --git a/Hello.py b/Hello.py
index 4184b08483a01b5850b2036d730fe047ce2f50fb..069121e199d2dd290dba150c147c940b8f070edb 100644
--- a/Hello.py
+++ b/Hello.py
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-print("Hello World, Michelle")
-=======
 print("Hello World")
 print("I am feeling happy today")
->>>>>>> develop
+print("Hello World, Michelle")