diff --git a/Hello.py b/Hello.py
index 80e444c93caae8bcd457153daa66dd0f3b026307..2f84ebd11e9c3f3d76ac5fab85a91cbc44dc1f55 100644
--- a/Hello.py
+++ b/Hello.py
@@ -1 +1,7 @@
+<<<<<<< HEAD
 print("Macbook tests")
+=======
+print("Hello world")
+print("I am feeling happy today")
+
+>>>>>>> bea18161f6a8886907f431e2970695436e6fff9b