message: fix for merge conflict
diff: @@ -658,7 +658,9 @@ impl<F: FftField + SquareRootField> ConstraintSystem<F> {
  // ------
  let lookup_constraint_system =
  - LookupConstraintSystem::create(&gates, lookup_tables, &domain).ok()?;
  + LookupConstraintSystem::create(&gates, lookup_tables, &domain)
  + .ok()
  + .unwrap();
  //
  // Constant polynomials
  