Update states.dm

code/modules/tgui/states.dm

@@ -20,15 +20,9 @@
 		return
 
 	if(isobserver(user))
-<<<<<<< HEAD
-		// // If they turn on ghost AI control, admins can always interact.
-		// if(user.client.advanced_admin_interaction)
-		// 	. = max(., STATUS_INTERACTIVE)
-=======
 		// Admins can always interact.
 		if(check_rights(R_ADMIN|R_EVENT, 0, src))
 			. = max(., STATUS_INTERACTIVE)
->>>>>>> 5daee31... Merge pull request #7847 from Cerebulon/aghostfixEM
 
 		// Regular ghosts can always at least view if in range.
 		if(user.client)
@@ -132,4 +126,4 @@
 
 // Topic Extensions for old UIs
 /datum/proc/CanUseTopic(var/mob/user, var/datum/tgui_state/state)
-	return tgui_status(user, state)
+	return tgui_status(user, state)