diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm
index 3dcbd50bee..930b5080b7 100644
--- a/code/_globalvars/genetics.dm
+++ b/code/_globalvars/genetics.dm
@@ -1,32 +1,3 @@
-<<<<<<< HEAD
-	//////////////
-GLOBAL_VAR_INIT(NEARSIGHTBLOCK, 0)
-GLOBAL_VAR_INIT(EPILEPSYBLOCK, 0)
-GLOBAL_VAR_INIT(COUGHBLOCK, 0)
-GLOBAL_VAR_INIT(TOURETTESBLOCK, 0)
-GLOBAL_VAR_INIT(NERVOUSBLOCK, 0)
-GLOBAL_VAR_INIT(BLINDBLOCK, 0)
-GLOBAL_VAR_INIT(DEAFBLOCK, 0)
-GLOBAL_VAR_INIT(HULKBLOCK, 0)
-GLOBAL_VAR_INIT(TELEBLOCK, 0)
-GLOBAL_VAR_INIT(FIREBLOCK, 0)
-GLOBAL_VAR_INIT(XRAYBLOCK, 0)
-GLOBAL_VAR_INIT(CLUMSYBLOCK, 0)
-GLOBAL_VAR_INIT(STRANGEBLOCK, 0)
-GLOBAL_VAR_INIT(RACEBLOCK, 0)
-
-GLOBAL_LIST(bad_se_blocks)
-GLOBAL_LIST(good_se_blocks)
-GLOBAL_LIST(op_se_blocks)
-
-GLOBAL_VAR(NULLED_SE)
-GLOBAL_VAR(NULLED_UI)
-
-GLOBAL_LIST_EMPTY(global_mutations) // list of hidden mutation things
-
-GLOBAL_LIST_EMPTY(bad_mutations)
-GLOBAL_LIST_EMPTY(good_mutations)
-=======
 	//////////////
 GLOBAL_VAR_INIT(NEARSIGHTBLOCK, 0)
 GLOBAL_VAR_INIT(EPILEPSYBLOCK, 0)
@@ -54,5 +25,4 @@ GLOBAL_LIST_EMPTY(global_mutations) // list of hidden mutation things
 
 GLOBAL_LIST_EMPTY(bad_mutations)
 GLOBAL_LIST_EMPTY(good_mutations)
->>>>>>> d1c1a28... adds italian moustache that makes you italian (#35426)
-GLOBAL_LIST_EMPTY(not_good_mutations)
\ No newline at end of file
+GLOBAL_LIST_EMPTY(not_good_mutations)