diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b1ad2b595d..fd3d755f2c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -36,12 +36,7 @@
 # duncathan
 
 /code/__DEFINES/atmospherics.dm @duncathan
-<<<<<<< HEAD
-/code/controllers/subsystem/air.dm @duncathan
-/code/modules/atmospherics/* @duncathan
-=======
 /code/modules/atmospherics/ @duncathan
->>>>>>> 8ed12ef... Merge pull request #35050 from ShizCalev/codeowners-fix
 
 # Jordie0608