diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm
index 02c5ca4cd143..80fabaf61a3e 100644
--- a/code/__DEFINES/role_preferences.dm
+++ b/code/__DEFINES/role_preferences.dm
@@ -26,7 +26,7 @@
 #define ROLE_SERVANT_OF_RATVAR	"servant of Ratvar"
 #define ROLE_BROTHER			"blood brother"
 #define ROLE_BRAINWASHED		"brainwashed victim"
-#define ROLE_OVERTHROW			"syndicate mutineer",
+#define ROLE_OVERTHROW			"syndicate mutineer"
 #define ROLE_SHADOWLING 		"shadowling" // Yogs
 
 //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
@@ -50,11 +50,8 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_ABDUCTOR,
 	ROLE_DEVIL = /datum/game_mode/devil,
 	ROLE_SERVANT_OF_RATVAR = /datum/game_mode/clockwork_cult,
-<<<<<<< HEAD
+	ROLE_OVERTHROW = /datum/game_mode/overthrow,
 	ROLE_SHADOWLING = /datum/game_mode/shadowling //yogs
-=======
-	ROLE_OVERTHROW = /datum/game_mode/overthrow
->>>>>>> 3649e81e78f8cde4a7dc59b442a0b1074ff617c9
 ))
 
 //Job defines for what happens when you fail to qualify for any job during job selection
diff --git a/yogstation/code/datums/components/walks.dm b/yogstation/code/datums/components/walks.dm
index 9444ed79003d..badec297eb91 100644
--- a/yogstation/code/datums/components/walks.dm
+++ b/yogstation/code/datums/components/walks.dm
@@ -63,8 +63,8 @@
 			if(L.buckled && L.buckled.buckle_prevents_pull)
 				user.stop_pulling()
 				return
+			L.face_atom(user)
 		pulled = user.pulling
-		pulled.face_atom(user)
 		user.pulling.forceMove(get_turf(user))
 
 /datum/component/walk/shadow/finalize_move(mob/living/user, turf/destination)
diff --git a/yogstation/code/modules/antagonists/shadowling/shadowling.dm b/yogstation/code/modules/antagonists/shadowling/shadowling.dm
index f955afd73414..b9d22a8e41ac 100644
--- a/yogstation/code/modules/antagonists/shadowling/shadowling.dm
+++ b/yogstation/code/modules/antagonists/shadowling/shadowling.dm
@@ -74,19 +74,17 @@
 
 /datum/antagonist/shadowling/roundend_report_header()
 	if(SSticker.mode.shadowling_ascended) //Doesn't end instantly - this is hacky and I don't know of a better way ~X
-		return "<span class='greentext big'>The shadowlings have ascended and taken over the station!</span>"
+		return "<span class='greentext big'>The shadowlings have ascended and taken over the station!</span><br>"
 	else if(!SSticker.mode.shadowling_ascended && check_shadow_death()) //If the shadowlings have ascended, they can not lose the round
-		return "<span class='redtext big'>The shadowlings have been killed by the crew!</span>"
+		return "<span class='redtext big'>The shadowlings have been killed by the crew!</span><br>"
 	else if(!SSticker.mode.shadowling_ascended && SSshuttle.emergency.mode >= SHUTTLE_ESCAPE)
-		return "<span class='redtext big'>The crew escaped the station before the shadowlings could ascend!</span>"
+		return "<span class='redtext big'>The crew escaped the station before the shadowlings could ascend!</span><br>"
 	else
-		return "<span class='redtext big'>The shadowlings have failed!</span>"
+		return "<span class='redtext big'>The shadowlings have failed!</span><br>"
 
 /datum/antagonist/shadowling/roundend_report_footer()
-	var/msg = "<span class='redtext big'>The shadowlings have not managed to convert anyone!</span></div>"
-	if(LAZYLEN(SSticker.mode.thralls))
-		msg = "The thralls were:<br>[printplayerlist(SSticker.mode.thralls)]"
-	return msg
+	if(!LAZYLEN(SSticker.mode.thralls))
+		return "<span class='redtext big'>The shadowlings have not managed to convert anyone!</span></div>"
 
 /datum/objective/ascend
 	explanation_text = "Ascend to your true form by use of the Ascendance ability. This may only be used with 15 or more collective thralls, while hatched, and is unlocked with the Collective Mind ability."
diff --git a/yogstation/code/modules/antagonists/shadowling/thrall.dm b/yogstation/code/modules/antagonists/shadowling/thrall.dm
index 15e05f49ce19..209151be2882 100644
--- a/yogstation/code/modules/antagonists/shadowling/thrall.dm
+++ b/yogstation/code/modules/antagonists/shadowling/thrall.dm
@@ -50,4 +50,4 @@ GLOBAL_LIST_INIT(thrall_spell_types, typecacheof(list(/obj/effect/proc_holder/sp
 	SEND_SOUND(owner.current, sound('yogstation/sound/ambience/antag/thrall.ogg'))
 
 /datum/antagonist/thrall/roundend_report()
-	return "<div class='panel redborder'>[printplayerlist(SSticker.mode.thralls)]</div>"
\ No newline at end of file
+	return "[printplayerlist(SSticker.mode.thralls)]"
\ No newline at end of file