diff --git a/code/datums/managed_browsers/feedback_form.dm b/code/datums/managed_browsers/feedback_form.dm
index ec8dad41ab..9886a55951 100644
--- a/code/datums/managed_browsers/feedback_form.dm
+++ b/code/datums/managed_browsers/feedback_form.dm
@@ -99,11 +99,7 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form)
 	if(href_list["feedback_edit_body"])
 		// This is deliberately not sanitized here, and is instead checked when hitting the submission button,
 		// as we want to give the user a chance to fix it without needing to rewrite the whole thing.
-<<<<<<< HEAD
-		feedback_body = input(my_client, "Please write your feedback here.", "Feedback Body", feedback_body) as null|message
-=======
 		feedback_body = tgui_input_text(my_client, "Please write your feedback here.", "Feedback Body", feedback_body, multiline = TRUE, prevent_enter = TRUE)
->>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
 		display() // Refresh the window with new information.
 		return
 
@@ -148,4 +144,4 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form)
 			if(istype(my_client.mob, /mob/new_player))
 				var/mob/new_player/NP = my_client.mob
 				NP.new_player_panel_proc() // So the feedback button goes away, if the user gets put on cooldown.
-			qdel(src)
\ No newline at end of file
+			qdel(src)