diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm
index 86f14f8ec0..a23f050c13 100644
--- a/code/__DEFINES/stat.dm
+++ b/code/__DEFINES/stat.dm
@@ -18,14 +18,9 @@
 #define HUSK		64
 #define NOCLONE		128
 #define CLUMSY		256
-<<<<<<< HEAD
-#define DUMB		512
-#define MONKEYLIKE	1024 //sets IsAdvancedToolUser to FALSE
-=======
 #define DUMB        512
 #define MONKEYLIKE  1024 //sets IsAdvancedToolUser to FALSE
 #define PACIFISM 	2048
->>>>>>> b5d9845... [Ready]Brain Trauma additions (#33405)
 
 // bitflags for machine stat variable
 #define BROKEN		1