diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm
index 0e1f1fb8fd..4692826a9c 100644
--- a/code/controllers/subsystem/dbcore.dm
+++ b/code/controllers/subsystem/dbcore.dm
@@ -237,6 +237,22 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table
 	item = list()
 	_db_query = _dm_db_new_query()
 
+<<<<<<< HEAD
+=======
+/datum/DBQuery/Destroy()
+	Close()
+	SSdbcore.active_queries -= src
+	return ..()
+
+/datum/DBQuery/CanProcCall(proc_name)
+	//fuck off kevinz
+	return FALSE
+
+/datum/DBQuery/proc/Activity(activity)
+	last_activity = activity
+	last_activity_time = world.time
+
+>>>>>>> 1a22d45... [s] Fixes stack overflow (#38592)
 /datum/DBQuery/proc/warn_execute()
 	. = Execute()
 	if(!.)