diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm
index 5f41533496d..cd08fb7f4cf 100644
--- a/code/modules/tgui/states/default.dm
+++ b/code/modules/tgui/states/default.dm
@@ -74,10 +74,6 @@ GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new)
 		return ..()
 
 /mob/observer/dead/default_can_use_tgui_topic()
-<<<<<<< HEAD
-	if(can_admin_interact())
-=======
 	if(check_rights(R_ADMIN|R_EVENT, 0, src))
->>>>>>> 9a3a7fb... Merge pull request #7879 from Cerebulon/gigglezone
 		return STATUS_INTERACTIVE				// Admins are more equal
 	return STATUS_UPDATE						// Ghosts can view updates