diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
index 4d061d05ef..5b8dbc59a5 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
@@ -82,19 +82,12 @@
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
 
 /datum/gear/uniform/job_trek/eng/tos
-<<<<<<< HEAD
 	display_name = "TOS uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
 	path = /obj/item/clothing/under/rank/trek/eng //CHOMPEdit: Engineering only
-	allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
+	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
 	
 //CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
 
-=======
-	display_name = "TOS uniform, eng/sec"
-	path = /obj/item/clothing/under/rank/trek/engsec
-	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security")
->>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
-
 //TNG
 /datum/gear/uniform/job_trek/cmd/tng
 	display_name = "TNG uniform, cmd"
@@ -107,17 +100,11 @@
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
 
 /datum/gear/uniform/job_trek/eng/tng
-<<<<<<< HEAD
 	display_name = "TNG uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
 	path = /obj/item/clothing/under/rank/trek/eng/next //CHOMPEdit: Engineering only
-	allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
+	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
 	
 //CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
-=======
-	display_name = "TNG uniform, eng/sec"
-	path = /obj/item/clothing/under/rank/trek/engsec/next
-	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security")
->>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
 
 //VOY
 /datum/gear/uniform/job_trek/cmd/voy
@@ -131,19 +118,12 @@
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
 
 /datum/gear/uniform/job_trek/eng/voy
-<<<<<<< HEAD
 	display_name = "VOY uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
 	path = /obj/item/clothing/under/rank/trek/eng/voy //CHOMPEdit: Engineering only
-	allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
+	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
 	
 //CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
 
-=======
-	display_name = "VOY uniform, eng/sec"
-	path = /obj/item/clothing/under/rank/trek/engsec/voy
-	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security")
->>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
-
 //DS9
 
 /datum/gear/suit/job_trek/ds9_coat
@@ -152,11 +132,7 @@
 	allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director",
 						"Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist",
 						"Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician",
-<<<<<<< HEAD
-						"Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS
-=======
-						"Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic")
->>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
+						"Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS
 
 
 /datum/gear/uniform/job_trek/cmd/ds9
@@ -170,15 +146,9 @@
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
 
 /datum/gear/uniform/job_trek/eng/ds9
-<<<<<<< HEAD
 	display_name = "DS9 uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
 	path = /obj/item/clothing/under/rank/trek/eng/ds9 //CHOMPEdit: Engineering only
-	allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
-=======
-	display_name = "DS9 uniform, eng/sec"
-	path = /obj/item/clothing/under/rank/trek/engsec/ds9
-	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security")
->>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
+	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
 
 //CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
 
@@ -194,18 +164,12 @@
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
 
 /datum/gear/uniform/job_trek/eng/ent
-<<<<<<< HEAD
 	display_name = "ENT uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
 	path = /obj/item/clothing/under/rank/trek/eng/ent //CHOMPEdit: Engineering only
-	allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
+	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
 	
 //CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
 	
-=======
-	display_name = "ENT uniform, eng/sec"
-	path = /obj/item/clothing/under/rank/trek/engsec/ent
-	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security")
->>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
 /*
 Swimsuits
 */