diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 22e6bd1730..bd7f16f99d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -60,12 +60,6 @@
 /code/modules/shuttle/* @ninjanomnom
 
 # ShizCalev
-
-<<<<<<< HEAD
-/_maps/* @ShizCalev
-/icons/* @ShizCalev
-/sound/* @ShizCalev
-=======
 /_maps/ @ShizCalev
 /icons/ @ShizCalev
 /sound/ @ShizCalev
@@ -73,4 +67,3 @@
 # WJohnston
 
 /icons/ @WJohn
->>>>>>> 0363132... Adds the art director as /icons folder codeowner (#34803)