Resolve conflicts

Author: dk19y

crates/chat-cli/src/mcp_client/client.rs

@@ -59,8 +59,6 @@ use crate::cli::chat::tools::custom_tool::{
     TransportType,
 };
 use crate::os::Os;
-<<<<<<< HEAD
-use crate::util::directories::DirectoryError;
 use crate::util::env_var::get_all_env_vars;
 
 /// Fetches all pages of specified resources from a server
@@ -142,8 +140,6 @@ pub enum McpClientError {
     #[error("Client has not finished initializing")]
     NotReady,
     #[error(transparent)]
-    Directory(#[from] DirectoryError),
-    #[error(transparent)]
     OauthUtil(#[from] OauthUtilError),
     #[error(transparent)]
     Parse(#[from] url::ParseError),