From fb94ace3db5b0c3f5dc41ce24a313f0f1275b64d Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Mon, 17 Oct 2022 10:02:36 +0200
Subject: [PATCH] Fix conflict

---
 plonky2/src/plonk/conditional_recursive_verifier.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plonky2/src/plonk/conditional_recursive_verifier.rs b/plonky2/src/plonk/conditional_recursive_verifier.rs
index 28041b4b..2c406904 100644
--- a/plonky2/src/plonk/conditional_recursive_verifier.rs
+++ b/plonky2/src/plonk/conditional_recursive_verifier.rs
@@ -47,7 +47,7 @@ where
         !common_data.config.zero_knowledge,
         "Degree calculation can be off if zero-knowledge is on."
     );
-    let degree = 1 << common_data.degree_bits;
+    let degree = common_data.degree();
     // Number of `NoopGate`s to add to get a circuit of size `degree` in the end.
     // Need to account for public input hashing, a `PublicInputGate` and a `ConstantGate`.
     let num_noop_gate = degree - ceil_div_usize(common_data.num_public_inputs, 8) - 2;