diff --git a/code/modules/client/verbs/character_directory.dm b/code/modules/client/verbs/character_directory.dm
index 5491566ea4..c4bb319502 100644
--- a/code/modules/client/verbs/character_directory.dm
+++ b/code/modules/client/verbs/character_directory.dm
@@ -151,16 +151,8 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
 				return
 
 			var/current_ad = usr.client.prefs.directory_ad
-<<<<<<< refs/remotes/Upstream/master
-			var/new_ad = sanitize(tgui_input_text(usr, "Change your character ad", "Character Ad", current_ad, multiline = TRUE), extra = 0)
-=======
-<<<<<<< HEAD
-			var/new_ad = sanitize(input(usr, "Change your character ad", "Character Ad", current_ad) as message|null, extra = 0)
-=======
 			var/new_ad = sanitize(tgui_input_text(usr, "Change your character ad", "Character Ad", current_ad, multiline = TRUE, prevent_enter = TRUE), extra = 0)
->>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
->>>>>>> Input Fixes
 			if(isnull(new_ad))
 				return
 			usr.client.prefs.directory_ad = new_ad
-			return TRUE
\ No newline at end of file
+			return TRUE