Resolve conflicts, fix compile errors

code/game/jobs/job/special_vr.dm

@@ -7,7 +7,6 @@
 	spawn_positions = 1
 	supervisors = "company officials and Corporate Regulations"
 	selection_color = "#1D1D4F"
-	idtype = /obj/item/weapon/card/id/centcom
 	access = list()
 	minimal_access = list()
 	minimal_player_age = 14

code/game/objects/items/weapons/id cards/station_ids.dm

@@ -265,14 +265,8 @@
 	rank = "Quartermaster"
 
 /obj/item/weapon/card/id/assistant
-<<<<<<< HEAD
 	assignment = USELESS_JOB //VOREStation Edit - Visitor not Assistant
 	rank = USELESS_JOB //VOREStation Edit - Visitor not Assistant
-	job_access_type = /datum/job/assistant
-=======
-	assignment = "Assistant"
-	rank = "Assistant"
->>>>>>> 7b9bc5b... Merge pull request #6520 from Meghan-Rossi/idcleanup
 
 /obj/item/weapon/card/id/civilian
 	name = "identification card"