diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 34ab946b2a..042263f8a3 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -103,18 +103,6 @@
 	data["regions"] = null
 	data["id_rank"] = modify && modify.assignment ? modify.assignment : "Unassigned"
 
-<<<<<<< HEAD
-	data["jobs"] = list(
-				list("cat" = "Engineering", "jobs" = format_jobs(engineering_positions)),
-				list("cat" = "Medical", "jobs" = format_jobs(medical_positions)),
-				list("cat" = "Science", "jobs" = format_jobs(science_positions)),
-				list("cat" = "Security", "jobs" = format_jobs(security_positions)),
-				list("cat" = "Cargo", "jobs" = format_jobs(cargo_positions)),
-				list("cat" = "Exploration", "jobs" = format_jobs(planet_positions)), //VOREStation Edit
-				list("cat" = "Civilian", "jobs" = format_jobs(civilian_positions)),
-				list("cat" = "CentCom", "jobs" = format_jobs(get_all_centcom_jobs()))
-			)
-=======
 	var/list/departments = list()
 	for(var/D in SSjob.get_all_department_datums())
 		var/datum/department/dept = D
@@ -125,7 +113,6 @@
 		departments[++departments.len] = list("department_name" = dept.name, "jobs" = format_jobs(SSjob.get_job_titles_in_department(dept.name)) )
 
 	data["departments"] = departments
->>>>>>> 24fbd0b... Half-Refactors Jobs (#6762)
 
 	if (modify && is_centcom())
 		var/list/all_centcom_access = list()