diff --git a/code/modules/lore_codex/codex.dm b/code/modules/lore_codex/codex.dm
index 1af8b128ba..8af1bdd924 100644
--- a/code/modules/lore_codex/codex.dm
+++ b/code/modules/lore_codex/codex.dm
@@ -40,12 +40,9 @@
 	w_class = ITEMSIZE_SMALL
 	root_type = /datum/lore/codex/category/main_news
 	libcategory = "Reference"
-<<<<<<< HEAD
+	drop_sound = 'sound/items/drop/device.ogg'
 
 /* //VORESTATION REMOVAL
-=======
-	drop_sound = 'sound/items/drop/device.ogg'
->>>>>>> 22e28f2... Merge pull request #6804 from Cerebulon/bigsounds
 // Combines SOP/Regs/Law
 /obj/item/weapon/book/codex/corp_regs
 	name = "NanoTrasen Regulatory Compendium"