diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm
index df295f6e12..331bc6765f 100644
--- a/code/__DEFINES/stat.dm
+++ b/code/__DEFINES/stat.dm
@@ -1,36 +1,3 @@
-<<<<<<< HEAD
-/*
-	Used with the various stat variables (mob, machines)
-*/
-
-//mob/var/stat things
-#define CONSCIOUS	0
-#define SOFT_CRIT	1
-#define UNCONSCIOUS	2
-#define DEAD		3
-
-//mob disabilities stat
-
-#define BLIND 		1
-#define MUTE		2
-#define DEAF		4
-#define NEARSIGHT	8
-#define FAT			32
-#define HUSK		64
-#define NOCLONE		128
-#define CLUMSY		256
-
-// bitflags for machine stat variable
-#define BROKEN		1
-#define NOPOWER		2
-#define MAINT		4			// under maintaince
-#define EMPED		8		// temporary broken by EMP pulse
-
-//ai power requirement defines
-#define POWER_REQ_NONE 0
-#define POWER_REQ_ALL 1
-#define POWER_REQ_CLOCKCULT 2
-=======
 /*
 	Used with the various stat variables (mob, machines)
 */
@@ -51,8 +18,8 @@
 #define HUSK		64
 #define NOCLONE		128
 #define CLUMSY		256
-#define DUMB        512
-#define MONKEYLIKE  1024 //sets IsAdvancedToolUser to FALSE
+#define DUMB		512
+#define MONKEYLIKE	1024 //sets IsAdvancedToolUser to FALSE
 
 // bitflags for machine stat variable
 #define BROKEN		1
@@ -64,4 +31,3 @@
 #define POWER_REQ_NONE 0
 #define POWER_REQ_ALL 1
 #define POWER_REQ_CLOCKCULT 2
->>>>>>> 550d711... Brain Traumas (#31727)