From 8053d527b23ef1b1e260e101a09dccbf2fc3670f Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Thu, 9 Mar 2023 15:06:26 +1000
Subject: [PATCH] Update code/modules/mob/new_player/preferences_setup.dm

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
---
 code/modules/mob/new_player/preferences_setup.dm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index e500fed1273..52dbf78507f 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -258,15 +258,10 @@
 		mannequin.dna = new /datum/dna(null)
 	mannequin.delete_inventory(TRUE)
 	dress_preview_mob(mannequin)
-<<<<<<< HEAD
 	mannequin.update_transform() //VOREStation Edit to update size/shape stuff.
-	mannequin.toggle_tail(setting = TRUE)
-	mannequin.toggle_wing(setting = TRUE)
-	mannequin.update_tail_showing()
-=======
 	mannequin.toggle_tail(setting = animations_toggle)
 	mannequin.toggle_wing(setting = animations_toggle)
->>>>>>> 15556ba4cad... Merge pull request #8944 from Seris02/wagtoggle
+	mannequin.update_tail_showing()
 	mannequin.ImmediateOverlayUpdate()
 
 	update_character_previews(new /mutable_appearance(mannequin))