diff --git a/students.txt b/students.txt
index c9cb7bb..a4c3ca9 100644
--- a/students.txt
+++ b/students.txt
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
+-Cam Macdonell - cmacdonell
+-Scott Deans -Deanss3
+=======
 Cam Macdonell - cmacdonell
 David Brookwell-Reuber - brookwellreuber
+>>>>>>> upstream/master