diff --git a/apps/web/src/components/review/ConflictResolutionPanel.tsx b/apps/web/src/components/review/ConflictResolutionPanel.tsx
index cc55c06..ea2ff36 100644
--- a/apps/web/src/components/review/ConflictResolutionPanel.tsx
+++ b/apps/web/src/components/review/ConflictResolutionPanel.tsx
@@ -13,7 +13,7 @@ interface ConflictResolutionPanelProps {
 export function ConflictResolutionPanel({ initiativeId, conflicts, onResolved }: ConflictResolutionPanelProps) {
   const { state, agent, questions, spawn, resume, stop, dismiss } = useConflictAgent(initiativeId);
   const [showManual, setShowManual] = useState(false);
-  const prevStateRef = useRef(state);
+  const prevStateRef = useRef<string | null>(null);
 
   // Auto-dismiss and re-check mergeability when conflict agent completes
   useEffect(() => {