diff --git a/team.txt b/team.txt
index 8e74c20..c463a65 100644
--- a/team.txt
+++ b/team.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 1. Andee
 2. Baylla
 3. Davved
@@ -7,5 +8,5 @@
 7. Loois
 8. Rian
 9. Rodreego
-10. Sammual
+10. Samuel
 11. Stowyen