fixed typos

i fixed some typos that were added to files
byuccl · Oct 13, 2024 · ab3ccae · ab3ccae
1 parent 6c28465
commit ab3ccae
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/_data/students.yaml b/_data/students.yaml
@@ -88,19 +88,14 @@ undergrad_students:
     last_name: Walker
     image: Preston_Walker.jpg
 
-<<<<<<< HEAD
-    - first_name: Gohaun
-    last_name: Manley
-    image: gohaun_manley.jpg
-=======
   - first_name: Ayden
     last_name: Bales
     image: ayden_bales.jpg
-  
+
   - first_name: Connor
     last_name: Young
     image: connor_young.jpg
 
-
-
->>>>>>> upstream/main
+  - first_name: Gohaun
+    last_name: Manley
+    image: gohaun_manley.jpg