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