diff --git a/src/config.rs b/src/config.rs
index a4cce22eb3f..e15e04474ae 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -491,7 +491,11 @@ impl Cfg {
         }
     }
 
+<<<<<<< HEAD
     pub(crate) fn which_binary(&self, path: &Path, binary: &str) -> Result<PathBuf> {
+=======
+    pub(crate) fn which_binary(&self, path: &Path, binary: &str) -> Result<Option<PathBuf>> {
+>>>>>>> 2fcb8beb (Make all src functions and structs crate-private)
         let (toolchain, _) = self.find_or_install_override_toolchain_or_default(path)?;
         Ok(toolchain.binary_file(binary))
     }
@@ -1008,9 +1012,13 @@ impl Cfg {
     }
 
     pub(crate) fn resolve_toolchain(&self, name: &str) -> Result<String> {
+<<<<<<< HEAD
         // remove trailing slashes in toolchain name
         let normalized_name = name.trim_end_matches('/');
         if let Ok(desc) = dist::PartialToolchainDesc::from_str(normalized_name) {
+=======
+        if let Ok(desc) = dist::PartialToolchainDesc::from_str(name) {
+>>>>>>> 2fcb8beb (Make all src functions and structs crate-private)
             let host = self.get_default_host_triple()?;
             Ok(desc.resolve(&host)?.to_string())
         } else {