Fix

code/modules/modular_computers/file_system/programs/research/email_administration.dm

@@ -66,13 +66,8 @@
 		return TRUE
 
 	// High security - can only be operated when the user has an ID with access on them.
-<<<<<<< HEAD
-	var/obj/item/card/id/I = usr.GetIdCard()
-	if(!istype(I) || !(access_network in I.access))
-=======
 	var/obj/item/card/id/I = usr.GetIdCard()
 	if(!istype(I) || !(access_network in I.GetAccess()))
->>>>>>> master
 		return TRUE
 
 	switch(action)

code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm

@@ -72,13 +72,8 @@ var/warrant_uid = 0
 	// The following actions will only be possible if the user has an ID with security access equipped. This is in line with modular computer framework's authentication methods,
 	// which also use RFID scanning to allow or disallow access to some functions. Anyone can view warrants, editing requires ID. This also prevents situations where you show a tablet
 	// to someone who is to be arrested, which allows them to change the stuff there.
-<<<<<<< HEAD
-	var/obj/item/card/id/I = usr.GetIdCard()
-	if(!istype(I) || !I.registered_name || !(access_security in I.access))
-=======
 	var/obj/item/card/id/I = usr.GetIdCard()
 	if(!istype(I) || !I.registered_name || !(access_security in I.GetAccess()))
->>>>>>> master
 		to_chat(usr, "Authentication error: Unable to locate ID with appropriate access to allow this operation.")
 		return