diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 73eb959b70..eaeb54b152 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -180,11 +180,7 @@
 		assigned_role = new_role
 
 	else if (href_list["memory_edit"])
-<<<<<<< HEAD
-		var/new_memo = sanitize(input("Write new memory", "Memory", memory) as null|message)
-=======
 		var/new_memo = sanitize(tgui_input_text(usr, "Write new memory", "Memory", memory, multiline = TRUE, prevent_enter = TRUE))
->>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
 		if (isnull(new_memo)) return
 		memory = new_memo
 
@@ -192,11 +188,7 @@
 		var/datum/mind/mind = locate(href_list["amb_edit"])
 		if(!mind)
 			return
-<<<<<<< HEAD
-		var/new_ambition = input("Enter a new ambition", "Memory", mind.ambitions) as null|message
-=======
 		var/new_ambition = tgui_input_text(usr, "Enter a new ambition", "Memory", mind.ambitions, multiline = TRUE, prevent_enter = TRUE)
->>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
 		if(isnull(new_ambition))
 			return
 		if(mind)
@@ -571,4 +563,4 @@
 /mob/living/simple_mob/construct/juggernaut/mind_initialize()
 	. = ..()
 	mind.assigned_role = "Juggernaut"
-	mind.special_role = "Cultist"
\ No newline at end of file
+	mind.special_role = "Cultist"