From f683d2ef2c278e95f653d8c7b6484edb4f05bb2c Mon Sep 17 00:00:00 2001
From: Luke Street <luke@street.dev>
Date: Tue, 3 Mar 2026 23:20:52 -0700
Subject: [PATCH] Fix merge conflict

---
 include/MetroidPrime/CStateManager.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/MetroidPrime/CStateManager.hpp b/include/MetroidPrime/CStateManager.hpp
index b318dc45..3cbc787f 100644
--- a/include/MetroidPrime/CStateManager.hpp
+++ b/include/MetroidPrime/CStateManager.hpp
@@ -476,7 +476,6 @@ private:
   bool RayCollideWorldInternal(const CVector3f& start, const CVector3f& end,
                                const CMaterialFilter& filter, const TEntityList& nearList,
                                const CActor* damagee) const;
-  void UpdateActorInSortedLists(CActor& actor);
   void UpdateEscapeSequenceTimer(float dt);
   void CreateStandardGameObjects();
   rstl::pair< const SScriptObjectStream*, TEditorId > GetBuildForScript(TEditorId eid) const;