diff --git a/intro.py b/intro.py
index 374a7a0..5a84655 100644
--- a/intro.py
+++ b/intro.py
@@ -1,2 +1,8 @@
 # print Hello World to the console
-print "Hello World"
\ No newline at end of file
+<<<<<<< HEAD
+print "Hello World!"
+greeting = "Hello Brian!"
+print (greeting)
+=======
+
+>>>>>>> 07e387fc90b155e4783c57e82733bbf5ee845ea9