diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2df370e6ea..22e6bd1730 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -61,6 +61,16 @@
 
 # ShizCalev
 
+<<<<<<< HEAD
 /_maps/* @ShizCalev
 /icons/* @ShizCalev
 /sound/* @ShizCalev
+=======
+/_maps/ @ShizCalev
+/icons/ @ShizCalev
+/sound/ @ShizCalev
+
+# WJohnston
+
+/icons/ @WJohn
+>>>>>>> 0363132... Adds the art director as /icons folder codeowner (#34803)