fix:merge conflict fix (RooCodeInc#2688)

* merge conflict fix

* changeset

Author: canvrno

.changeset/fifty-garlics-kneel.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+merge conflict fix

webview-ui/src/components/chat/ContextMenu.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useRef, useState } from "react"
-import { ContextMenuOptionType, ContextMenuQueryItem, getContextMenuOptions } from "@/utils/context-mentions"
+import { ContextMenuOptionType, ContextMenuQueryItem, getContextMenuOptions, SearchResult } from "@/utils/context-mentions"
 import { cleanPathPrefix } from "@/components/common/CodeAccordian"
 
 interface ContextMenuProps {