diff --git a/Bye.py b/Bye.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d72d93a78c2e0e1b9c13c3edddd83a9c3510125
--- /dev/null
+++ b/Bye.py
@@ -0,0 +1 @@
+print("Bye")
\ No newline at end of file
diff --git a/Hello.py b/Hello.py
index ca887dd6fedfa0cadd116ba3ca60bc748e58bf31..4184b08483a01b5850b2036d730fe047ce2f50fb 100644
--- a/Hello.py
+++ b/Hello.py
@@ -1 +1,6 @@
-print("Hello World, Michelle")
\ No newline at end of file
+<<<<<<< HEAD
+print("Hello World, Michelle")
+=======
+print("Hello World")
+print("I am feeling happy today")
+>>>>>>> develop