diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index 2406335915..173c8a6b8d 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -1,49 +1,3 @@
-<<<<<<< HEAD
-/mob/living/simple_animal/hostile/faithless
-	name = "The Faithless"
-	desc = "The Wish Granter's faith in humanity, incarnate."
-	icon_state = "faithless"
-	icon_living = "faithless"
-	icon_dead = "faithless_dead"
-	gender = MALE
-	speak_chance = 0
-	turns_per_move = 5
-	response_help = "passes through"
-	response_disarm = "shoves"
-	response_harm = "hits"
-	emote_taunt = list("wails")
-	taunt_chance = 25
-	speed = 0
-	maxHealth = 80
-	health = 80
-	stat_attack = UNCONSCIOUS
-	robust_searching = 1
-
-	harm_intent_damage = 10
-	obj_damage = 50
-	melee_damage_lower = 15
-	melee_damage_upper = 15
-	attacktext = "grips"
-	attack_sound = 'sound/hallucinations/growl1.ogg'
-	speak_emote = list("growls")
-
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
-
-	faction = list("faithless")
-	gold_core_spawnable = 1
-
-/mob/living/simple_animal/hostile/faithless/Process_Spacemove(movement_dir = 0)
-	return 1
-
-/mob/living/simple_animal/hostile/faithless/AttackingTarget()
-	. = ..()
-	if(. && prob(12) && iscarbon(target))
-		var/mob/living/carbon/C = target
-		C.Knockdown(60)
-		C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
-				"<span class='userdanger'>\The [src] knocks you down!</span>")
-=======
 /mob/living/simple_animal/hostile/faithless
 	name = "The Faithless"
 	desc = "The Wish Granter's faith in humanity, incarnate."
@@ -85,5 +39,4 @@
 		var/mob/living/carbon/C = target
 		C.Knockdown(60)
 		C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
-				"<span class='userdanger'>\The [src] knocks you down!</span>")
->>>>>>> 3a36c13... Process_Spacemove proc improvement (#32515)
+				"<span class='userdanger'>\The [src] knocks you down!</span>")