diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index a019109e44..e58bfc2354 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -172,10 +172,7 @@
 
 	if(href_list["SelectedJob"])
 
-<<<<<<< HEAD
 		/* Vorestation Removal Start
-=======
->>>>>>> 97f8c1d... Merge pull request #6719 from Neerti/feedback_system
 		//Prevents people rejoining as same character.
 		for (var/mob/living/carbon/human/C in mob_list)
 			var/char_name = client.prefs.real_name