diff --git a/lib/src/merged_tree.rs b/lib/src/merged_tree.rs
index 8fcb4c095..6a07e2b38 100644
--- a/lib/src/merged_tree.rs
+++ b/lib/src/merged_tree.rs
@@ -187,7 +187,7 @@ impl MergedTree {
     /// the input.
     pub fn resolve(&self) -> BackendResult<Merge<Tree>> {
         match self {
-            MergedTree::Legacy(tree) => Ok(Merge::resolved(tree.clone())),
+            MergedTree::Legacy(_) => panic!("Cannot resolve conflicts in legacy tree"),
             MergedTree::Merge(trees) => merge_trees(trees),
         }
     }