From ab3ccae7f1390c29945eb19ab2bef9cb5891f3c6 Mon Sep 17 00:00:00 2001
From: Gohaun Manley <gohaun@byu.edu>
Date: Sat, 12 Oct 2024 18:29:49 -0600
Subject: [PATCH] fixed typos

i fixed some typos that were added to files
---
 _data/students.yaml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/_data/students.yaml b/_data/students.yaml
index 8ef1e74..c0edaca 100755
--- 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
\ No newline at end of file