diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 2300eb5c7c..d63b5d4114 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -36,13 +36,9 @@
 	maxbodytemp = 1500
 
 	faction = list("russian")
-<<<<<<< HEAD
-	gold_core_spawnable = 1
+	gold_core_spawnable = HOSTILE_SPAWN
 	devourable = TRUE
 	no_vore = FALSE
-=======
-	gold_core_spawnable = HOSTILE_SPAWN
->>>>>>> 2abae67... Cleans up goldcore defines (#33090)
 
 //SPACE BEARS! SQUEEEEEEEE~     OW! FUCK! IT BIT MY HAND OFF!!
 /mob/living/simple_animal/hostile/bear/Hudson