feat: merge-train/avm (#16943)

BEGIN_COMMIT_OVERRIDE
chore(avm): formatting
END_COMMIT_OVERRIDE

Author: AztecBot

barretenberg/cpp/src/barretenberg/vm2/generated/flavor_variables.hpp

@@ -146,7 +146,6 @@ struct AvmFlavorVariables {
     // Need to be templated for recursive verifier
     template <typename FF_>
     using MainRelations_ = flat_tuple::tuple<
-
         // Optimized Relations
         avm2::optimized_poseidon2_perm<FF_>,
         // Relations

bb-pilcom/bb-pil-backend/templates/flavor_variables.hpp.hbs

@@ -32,8 +32,7 @@ struct AvmFlavorVariables {
     // Need to be templated for recursive verifier
     template <typename FF_>
     using MainRelations_ = flat_tuple::tuple<
-    {{!-- It's easier to handle the optimized relations first --}}
-    {{#each optimized_relations_file_names as |item|}}
+    {{#each optimized_relations_file_names as |item|}} {{!-- It's easier to handle the optimized relations first --}}
       {{#if @first}} {{!-- If an optimized relation exists --}}
       // Optimized Relations
       {{/if}}