diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 8ecd5c139f..b311f2f5c8 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -617,11 +617,7 @@ var/global/floorIsLava = 0
 	set desc="Announce your desires to the world"
 	if(!check_rights(0))	return
 
-<<<<<<< HEAD
-	var/message = tgui_input_message(usr, "Global message to send:", "Admin Announce")
-=======
 	var/message = tgui_input_text(usr, "Global message to send:", "Admin Announce", multiline = TRUE, prevent_enter = TRUE)
->>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
 	if(message)
 		if(!check_rights(R_SERVER,0))
 			message = sanitize(message, 500, extra = 0)
@@ -646,13 +642,8 @@ var/datum/announcement/minor/admin_min_announcer = new
 
 		if(sender) //They put a sender
 			sender = sanitize(sender, 75, extra = 0)
-<<<<<<< HEAD
-			var/message = input(usr, "Message content (max 500):", "Contents", "This is a test of the announcement system.") as null|message
-			var/msgverb = input(usr, "Name of verb (Such as 'states', 'says', 'asks', etc):", "Verb", "says") as null|text	//VOREStation Addition
-=======
 			var/message = tgui_input_text(usr, "Message content (max 500):", "Contents", "This is a test of the announcement system.", multiline = TRUE, prevent_enter = TRUE)
 			var/msgverb = tgui_input_text(usr, "Name of verb (Such as 'states', 'says', 'asks', etc):", "Verb", "says")
->>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
 			if(message) //They put a message
 				message = sanitize(message, 500, extra = 0)
 				//VOREStation Edit Start
@@ -690,11 +681,7 @@ var/datum/announcement/minor/admin_min_announcer = new
 		The above will result in those messages playing, with a 5 second gap between each. Maximum of 20 messages allowed.</span>")
 
 	var/list/decomposed
-<<<<<<< HEAD
-	var/message = input(usr,"See your chat box for instructions. Keep a copy elsewhere in case it is rejected when you click OK.", "Input Conversation", "") as null|message
-=======
 	var/message = tgui_input_text(usr,"See your chat box for instructions. Keep a copy elsewhere in case it is rejected when you click OK.", "Input Conversation", "", multiline = TRUE, prevent_enter = TRUE)
->>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
 
 	if(!message)
 		return