diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index bdd2a718d0..d7a4e5f55a 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -225,7 +225,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			<A href='?src=\ref[src];checkout=1'>(Commit Entry)</A><BR>
 			<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"}
 		if(4)
-			dat += "<h3>Deprecated Archive</h3>"
+			dat += "<h3>External Archive</h3>" //VOREStation Edit
 			establish_old_db_connection()
 
 			dat += "<h3><font color=red>Warning: System Administrator has slated this archive for removal. Personal uploads should be taken to the NT board of internal literature.</font></h3>"
@@ -251,7 +251,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			dat += "<H3>ERROR</H3>"
 			dat+= "<FONT color=red>Library Database is in Secure Management Mode.</FONT><BR>\
 			Contact a System Administrator for more information.<BR>"
-			/*
+			//VOREstation Edit Start
 			dat += "<H3>Upload a New Title</H3>"
 			if(!scanner)
 				for(var/obj/machinery/libraryscanner/S in range(9))
@@ -269,7 +269,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 				dat += {"<TT>Author: </TT><A href='?src=\ref[src];setauthor=1'>[scanner.cache.author]</A><BR>
 				<TT>Category: </TT><A href='?src=\ref[src];setcategory=1'>[upload_category]</A><BR>
 				<A href='?src=\ref[src];upload=1'>\[Upload\]</A><BR>"}
-			*/
+			//VOREStation Edit End
 			dat += "<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"
 		if(7)
 			dat += {"<h3>Accessing Forbidden Lore Vault v 1.3</h3>
@@ -391,7 +391,8 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 		if(newcategory)
 			upload_category = newcategory
 
-/*	if(href_list["upload"])
+	//VOREStation Edit Start
+	if(href_list["upload"])
 		if(scanner)
 			if(scanner.cache)
 				var/choice = input("Are you certain you wish to upload this title to the Archive?") in list("Confirm", "Abort")
@@ -419,7 +420,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 							else
 								log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs")
 								alert("Upload Complete.")
-*/
+	//VOREStation Edit End
 
 	if(href_list["targetid"])
 		var/sqlid = sanitizeSQL(href_list["targetid"])
diff --git a/code/modules/lore_codex/codex.dm b/code/modules/lore_codex/codex.dm
index f2c91bf6a6..c1cf1b3200 100644
--- a/code/modules/lore_codex/codex.dm
+++ b/code/modules/lore_codex/codex.dm
@@ -23,12 +23,8 @@
 	desc = "Contains useful information about the world around you.  It seems to have been written for travelers to Virgo-Erigone, human or not. It also \
 	has the words 'Don't Panic' in small, friendly letters on the cover."
 	icon_state = "codex"
-<<<<<<< HEAD
 	root_type = /datum/lore/codex/category/main_virgo_lore
-=======
-	root_type = /datum/lore/codex/category/main_vir_lore
 	libcategory = "Reference"
->>>>>>> 41fc81e... Setup for New Library (#6514)
 
 /obj/item/weapon/book/codex/lore/robutt
 	name = "A Buyer's Guide to Artificial Bodies"
@@ -54,8 +50,5 @@
 	icon_state = "corp_regs"
 	root_type = /datum/lore/codex/category/main_corp_regs
 	throwforce = 5 // Throw the book at 'em.
-<<<<<<< HEAD
-*/
-=======
 	libcategory = "Reference"
->>>>>>> 41fc81e... Setup for New Library (#6514)
+*/