Fix merge conflicts

src/cli.rs

@@ -293,7 +293,7 @@ fn build_command() -> Command {
         .arg(
             Arg::new("input")
                 .long("input")
-                .takes_value(true)
+                .action(ArgAction::Set)
                 .number_of_values(1)
                 .value_name("WHERE")
                 .help("Control where the input of the benchmark comes from.\n\

src/options.rs

@@ -388,7 +388,7 @@ impl Options {
                 .map_err(|e| OptionsError::FloatParsingError("min-benchmarking-time", e))?;
         }
 
-        options.command_input_policy = if let Some(path_str) = matches.value_of("input") {
+        options.command_input_policy = if let Some(path_str) = matches.get_one::<String>("input") {
             let path = PathBuf::from(path_str);
             if !path.exists() {
                 return Err(OptionsError::StdinDataFileDoesNotExist(