diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..2d13844
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1 @@
+* @jgoeders @wirthlin
diff --git a/_data/students.yaml b/_data/students.yaml
old mode 100644
new mode 100755
index 74ee696..8ef1e74
--- a/_data/students.yaml
+++ b/_data/students.yaml
@@ -88,6 +88,19 @@ undergrad_students:
     last_name: Walker
     image: Preston_Walker.jpg
 
+<<<<<<< HEAD
     - first_name: Gohaun
     last_name: Manley
-    image: gohaun_manley.jpg
\ No newline at end of file
+    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
diff --git a/images/students/ayden_bales.jpg b/images/students/ayden_bales.jpg
new file mode 100644
index 0000000..04f5674
Binary files /dev/null and b/images/students/ayden_bales.jpg differ
diff --git a/images/students/connor_young.jpg b/images/students/connor_young.jpg
new file mode 100644
index 0000000..471e5e5
Binary files /dev/null and b/images/students/connor_young.jpg differ