diff --git a/INFO-1208 (PHP)/Labs/Lab 2/l_mclean215318_week2.php b/INFO-1208 (PHP)/Labs/Lab 2/l_mclean215318_week2.php
index c86c44f..e7e273f 100644
--- a/INFO-1208 (PHP)/Labs/Lab 2/l_mclean215318_week2.php
+++ b/INFO-1208 (PHP)/Labs/Lab 2/l_mclean215318_week2.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
Levi McLean Lab 2
@@ -23,22 +22,3 @@
?>
-=======
-");
-echo("This is PHP.
");
-echo("This is the first string " . "this is the second string " . "this is my last string
");
-echo("We are in the month of " . date("F") . "
");
-echo("The value in the query string for my_var is " . $_REQUEST['my_var'] . "
");
-echo("My favorite flavour of ice cream is " . $favorite_ice_cream . "
");
-echo("My dog is a " . $dog_type . "
");
-echo("My dog is a " . $dog_type . "
");
-echo ERROR_MSG;
-?>
->>>>>>> 8711fbbbbb7d847daf7de42f4de6cd8e6f7d1965
diff --git a/INFO-1208 (PHP)/Notes/week2.php b/INFO-1208 (PHP)/Notes/week2.php
index 62c5ddb..73cbd18 100644
--- a/INFO-1208 (PHP)/Notes/week2.php
+++ b/INFO-1208 (PHP)/Notes/week2.php
@@ -25,7 +25,7 @@
greet("Levi", "McLean");
- greet2()
+ greet2();
$result = add(5, 3);
echo $result;
diff --git a/INFO-3163 (CMS Web Dev)/Labs/lab 2/SDLCTemplate.docx b/INFO-3163 (CMS Web Dev)/Labs/lab 2/SDLCTemplate.docx
index 2d59d9e..17228f3 100644
Binary files a/INFO-3163 (CMS Web Dev)/Labs/lab 2/SDLCTemplate.docx and b/INFO-3163 (CMS Web Dev)/Labs/lab 2/SDLCTemplate.docx differ