diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 47c7b81e26..7f301cc1e8 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -403,8 +403,5 @@
 	return
 
 /obj/item/paper/crumpled/bloody
-<<<<<<< HEAD
 	icon_state = "scrap_bloodied"
-=======
-	icon_state = "scrap_bloodied"
->>>>>>> 086d636... Alt-clicking descriptions when examining (#30988)
+