diff --git a/cli/src/template_builder.rs b/cli/src/template_builder.rs
index 80b24b9c37..1050ac8642 100644
--- a/cli/src/template_builder.rs
+++ b/cli/src/template_builder.rs
@@ -1176,7 +1176,6 @@ mod tests {
     use super::*;
     use crate::formatter::{self, ColorFormatter};
     use crate::generic_templater::GenericTemplateLanguage;
-    use crate::template_parser::TemplateAliasesMap;
 
     type TestTemplateLanguage = GenericTemplateLanguage<'static, ()>;
     type TestTemplatePropertyKind = <TestTemplateLanguage as TemplateLanguage<'static>>::Property;
diff --git a/lib/src/files.rs b/lib/src/files.rs
index 62346c65ff..a30d097870 100644
--- a/lib/src/files.rs
+++ b/lib/src/files.rs
@@ -16,7 +16,6 @@
 
 use std::collections::VecDeque;
 use std::fmt::{Debug, Error, Formatter};
-use std::ops::Range;
 
 use itertools::Itertools;
 
@@ -159,14 +158,6 @@ pub enum MergeResult {
     Conflict(Vec<Merge<ContentHunk>>),
 }
 
-/// A region where the base and two sides match.
-#[derive(Debug, PartialEq, Eq, Clone)]
-struct SyncRegion {
-    base: Range<usize>,
-    left: Range<usize>,
-    right: Range<usize>,
-}
-
 pub fn merge(slices: &Merge<&[u8]>) -> MergeResult {
     // TODO: Using the first remove as base (first in the inputs) is how it's
     // usually done for 3-way conflicts. Are there better heuristics when there are