diff --git a/code/modules/jobs/job_types/silicon.dm b/code/modules/jobs/job_types/silicon.dm
index d6cd75ee7b..bc3b31b2bf 100644
--- a/code/modules/jobs/job_types/silicon.dm
+++ b/code/modules/jobs/job_types/silicon.dm
@@ -1,61 +1,19 @@
-/*
-AI
-*/
-/datum/job/ai
-	title = "AI"
-	flag = AI_JF
-	department_flag = ENGSEC
-	faction = "Station"
-	total_positions = 0
-	spawn_positions = 1
-	selection_color = "#ccffcc"
-	supervisors = "your laws"
-	req_admin_notify = 1
-	minimal_player_age = 30
+/*
+AI
+*/
+/datum/job/ai
+	title = "AI"
+	flag = AI_JF
+	department_flag = ENGSEC
+	faction = "Station"
+	total_positions = 0
+	spawn_positions = 1
+	selection_color = "#ccffcc"
+	supervisors = "your laws"
+	req_admin_notify = 1
+	minimal_player_age = 30
 	exp_requirements = 180
 	exp_type = EXP_TYPE_CREW
-<<<<<<< HEAD
-
-/datum/job/ai/equip(mob/living/carbon/human/H)
-	return H.AIize(FALSE)
-
-/datum/job/ai/after_spawn(mob/living/silicon/ai/AI, mob/M)
-	AI.rename_self("ai", M.client)
-
-	//we may have been created after our borg
-	if(SSticker.current_state == GAME_STATE_SETTING_UP)
-		for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs)
-			if(!R.connected_ai)
-				R.TryConnectToAI()
-
-
-/datum/job/ai/config_check()
-	if(config && config.allow_ai)
-		return 1
-	return 0
-
-/*
-Cyborg
-*/
-/datum/job/cyborg
-	title = "Cyborg"
-	flag = CYBORG
-	department_flag = ENGSEC
-	faction = "Station"
-	total_positions = 0
-	spawn_positions = 1
-	supervisors = "your laws and the AI"	//Nodrak
-	selection_color = "#ddffdd"
-	minimal_player_age = 21
-	exp_requirements = 120
-	exp_type = EXP_TYPE_CREW
-
-/datum/job/cyborg/equip(mob/living/carbon/human/H)
-	return H.Robotize(FALSE, FALSE)
-
-/datum/job/cyborg/after_spawn(mob/living/silicon/robot/R, mob/M)
-	if(config.rename_cyborg)	//name can't be set in robot/New without the client
-=======
 
 /datum/job/ai/equip(mob/living/carbon/human/H)
 	return H.AIize(FALSE)
@@ -94,5 +52,4 @@ Cyborg
 
 /datum/job/cyborg/after_spawn(mob/living/silicon/robot/R, mob/M)
 	if(CONFIG_GET(flag/rename_cyborg))	//name can't be set in robot/New without the client
->>>>>>> 4178c20... Configuration datum refactor (#30763)
-		R.rename_self("cyborg", M.client)
\ No newline at end of file
+		R.rename_self("cyborg", M.client)