diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm
index 49033e4eb4..ec906ca3ad 100644
--- a/code/modules/paperwork/adminpaper.dm
+++ b/code/modules/paperwork/adminpaper.dm
@@ -87,15 +87,7 @@
 			to_chat(usr, "<span class='info'>There isn't enough space left on \the [src] to write anything.</span>")
 			return
 
-<<<<<<< refs/remotes/Upstream/master
-		var/raw_t = tgui_input_text(usr, "Enter what you want to write:", "Write", multiline = TRUE)
-=======
-<<<<<<< HEAD
-		var/raw_t = tgui_input_message(usr, "Enter what you want to write:", "Write")
-=======
 		var/raw_t = tgui_input_text(usr, "Enter what you want to write:", "Write", multiline = TRUE, prevent_enter = TRUE)
->>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
->>>>>>> Input Fixes
 		if(!raw_t)
 			return
 		var/t =  sanitize(raw_t, free_space, extra = 0)