Resolve Merge Conflict

partiql-logical-planner/src/lib.rs

@@ -25,7 +25,8 @@ impl<'c> LogicalPlanner<'c> {
         parsed: &Parsed,
     ) -> Result<logical::LogicalPlan<logical::BindingsOp>, AstTransformationError> {
         let q = &parsed.ast;
-        let mut resolver = NameResolver::new(self.catalog);
+        let catalog = PartiqlCatalog::default();
+        let mut resolver = NameResolver::new(&catalog);
         let registry = resolver.resolve(q)?;
         let planner = AstToLogical::new(self.catalog, registry);
         planner.lower_query(q)