diff --git a/code/modules/mob/living/silicon/pai/personality.dm b/code/modules/mob/living/silicon/pai/personality.dm
index 4912112be0..2c473be749 100644
--- a/code/modules/mob/living/silicon/pai/personality.dm
+++ b/code/modules/mob/living/silicon/pai/personality.dm
@@ -1,66 +1,3 @@
-<<<<<<< HEAD
-/*
-		name
-		key
-		description
-		role
-		comments
-		ready = 0
-*/
-
-/datum/paiCandidate/proc/savefile_path(mob/user)
-	return "data/player_saves/[copytext(user.ckey, 1, 2)]/[user.ckey]/pai.sav"
-
-/datum/paiCandidate/proc/savefile_save(mob/user)
-	if(IsGuestKey(user.key))
-		return 0
-
-	var/savefile/F = new /savefile(src.savefile_path(user))
-
-
-	WRITE_FILE(F["name"], name)
-	WRITE_FILE(F["description"], description)
-	WRITE_FILE(F["role"], role)
-	WRITE_FILE(F["comments"], comments)
-
-	WRITE_FILE(F["version"], 1)
-
-	return 1
-
-// loads the savefile corresponding to the mob's ckey
-// if silent=true, report incompatible savefiles
-// returns 1 if loaded (or file was incompatible)
-// returns 0 if savefile did not exist
-
-/datum/paiCandidate/proc/savefile_load(mob/user, silent = 1)
-	if (IsGuestKey(user.key))
-		return 0
-
-	var/path = savefile_path(user)
-
-	if (!fexists(path))
-		return 0
-
-	var/savefile/F = new /savefile(path)
-
-	if(!F)
-		return //Not everyone has a pai savefile.
-
-	var/version = null
-	F["version"] >> version
-
-	if (isnull(version) || version != 1)
-		fdel(path)
-		if (!silent)
-			alert(user, "Your savefile was incompatible with this version and was deleted.")
-		return 0
-
-	F["name"] >> src.name
-	F["description"] >> src.description
-	F["role"] >> src.role
-	F["comments"] >> src.comments
-	return 1
-=======
 /*
 		name
 		key
@@ -122,4 +59,3 @@
 	F["role"] >> src.role
 	F["comments"] >> src.comments
 	return 1
->>>>>>> f5ff686... Merge pull request #35424 from ShizCalev/var-cleanup