diff --git a/code/datums/weakrefs.dm b/code/datums/weakrefs.dm
index 6b47f3521d..2347d0f831 100644
--- a/code/datums/weakrefs.dm
+++ b/code/datums/weakrefs.dm
@@ -15,9 +15,4 @@
 
 /datum/weakref/proc/resolve()
 	var/datum/D = locate(reference)
-<<<<<<< HEAD
-	return D.weak_reference == src? D : null
-=======
 	return (!QDELETED(D) && D.weak_reference == src) ? D : null
-
->>>>>>> bdfbafd... [READY]integrated circuitry port+upgrade. (#32481)