diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm
index 7cecab471be..197e65e85b2 100644
--- a/code/game/gamemodes/changeling/changeling_powers.dm
+++ b/code/game/gamemodes/changeling/changeling_powers.dm
@@ -202,9 +202,15 @@
 
 	usr.visible_message(text("\red <B>[usr] transforms!</B>"))
 
+<<<<<<< .mine
+	usr.changeling.geneticdamage = 30
+  	usr << "Our genes cry out!"
+
+=======
 	usr.changeling.geneticdamage = 30
 	usr << "Our genes cry out!"
 
+>>>>>>> .r2659
 	var/list/implants = list() //Try to preserve implants.
 	for(var/obj/item/weapon/W in usr)
 		if (istype(W, /obj/item/weapon/implant))