diff --git a/src/air/layouts/starknet.cairo b/src/air/layouts/starknet.cairo
index 6bac0d55..c1f2d330 100644
--- a/src/air/layouts/starknet.cairo
+++ b/src/air/layouts/starknet.cairo
@@ -3,23 +3,13 @@ mod constants;
 mod global_values;
 mod public_input;
 mod traces;
-<<<<<<< HEAD
 #[cfg(feature: 'split')]
-=======
->>>>>>> autogenerated_split
 mod contract;
 
 use cairo_verifier::{
     air::{
         constants::{SHIFT_POINT_X, SHIFT_POINT_Y, StarkCurve},
         layouts::starknet::{
-<<<<<<< HEAD
-=======
-            contract::{
-                IStarknetLayoutContract1Dispatcher, IStarknetLayoutContract1DispatcherTrait,
-                IStarknetLayoutContract2Dispatcher, IStarknetLayoutContract2DispatcherTrait,
-            },
->>>>>>> autogenerated_split
             global_values::{
                 GlobalValues, InteractionElements, EcPoint, EcdsaSigConfig, CurveConfig
             },
diff --git a/src/air/layouts/starknet/contract.cairo b/src/air/layouts/starknet/contract.cairo
index 600440c5..e73220b8 100644
--- a/src/air/layouts/starknet/contract.cairo
+++ b/src/air/layouts/starknet/contract.cairo
@@ -27,14 +27,10 @@ trait ILayoutOodsContract<ContractState> {
 
 #[starknet::contract]
 mod LayoutCompositionContract {
-<<<<<<< HEAD
     use super::{
         ILayoutCompositionContract, ILayoutCompositionContractDispatcher,
         ILayoutCompositionContractDispatcherTrait
     };
-=======
-    use super::ILayoutCompositionContract;
->>>>>>> autogenerated_split
     use cairo_verifier::air::layouts::starknet::{
         global_values::GlobalValues, autogenerated::eval_composition_polynomial_inner_part_1,
     };
@@ -42,12 +38,8 @@ mod LayoutCompositionContract {
 
     #[storage]
     struct Storage {
-<<<<<<< HEAD
         continuation_contract1: ContractAddress,
         continuation_contract2: ContractAddress,
-=======
-        continuation_contracts: Array<ContractAddress>,
->>>>>>> autogenerated_split
     }
 
     #[abi(embed_v0)]
@@ -61,11 +53,7 @@ mod LayoutCompositionContract {
             global_values: GlobalValues
         ) -> felt252 {
             let mut total_sum = ILayoutCompositionContractDispatcher {
-<<<<<<< HEAD
                 contract_address: self.continuation_contract1.read()
-=======
-                contract_address: continuation_contracts[0]
->>>>>>> autogenerated_split
             }
                 .eval_composition_polynomial_inner(
                     mask_values,
@@ -76,13 +64,9 @@ mod LayoutCompositionContract {
                 );
 
             total_sum +=
-<<<<<<< HEAD
                 ILayoutCompositionContractDispatcher {
                     contract_address: self.continuation_contract2.read()
                 }
-=======
-                ILayoutCompositionContractDispatcher { contract_address: continuation_contracts[1] }
->>>>>>> autogenerated_split
                 .eval_composition_polynomial_inner(
                     mask_values,
                     constraint_coefficients.slice(99, 99),
diff --git a/src/air/layouts/starknet_with_keccak.cairo b/src/air/layouts/starknet_with_keccak.cairo
index 496bfad2..d5ef76ae 100644
--- a/src/air/layouts/starknet_with_keccak.cairo
+++ b/src/air/layouts/starknet_with_keccak.cairo
@@ -3,25 +3,13 @@ mod constants;
 mod global_values;
 mod public_input;
 mod traces;
-<<<<<<< HEAD
 #[cfg(feature: 'split')]
-=======
->>>>>>> autogenerated_split
 mod contract;
 
 use cairo_verifier::{
     air::{
         constants::{SHIFT_POINT_X, SHIFT_POINT_Y, StarkCurve},
         layouts::starknet_with_keccak::{
-<<<<<<< HEAD
-=======
-            contract::{
-                IStarknetWithKeccakLayoutContract1Dispatcher,
-                IStarknetWithKeccakLayoutContract1DispatcherTrait,
-                IStarknetWithKeccakLayoutContract2Dispatcher,
-                IStarknetWithKeccakLayoutContract2DispatcherTrait,
-            },
->>>>>>> autogenerated_split
             global_values::{
                 GlobalValues, InteractionElements, EcPoint, EcdsaSigConfig, CurveConfig
             },
@@ -48,11 +36,7 @@ use cairo_verifier::{
 use starknet::ContractAddress;
 
 #[cfg(feature: 'monolith')]
-<<<<<<< HEAD
 use cairo_verifier::air::layouts::starknet_with_keccak::autogenerated::{
-=======
-use cairo_verifier::air::layouts::starknet::autogenerated::{
->>>>>>> autogenerated_split
     eval_composition_polynomial_inner as eval_composition_polynomial_inner_,
     eval_oods_polynomial_inner as eval_oods_polynomial_inner_,
 };
@@ -87,11 +71,7 @@ fn eval_oods_polynomial_inner(
 }
 
 #[cfg(feature: 'split')]
-<<<<<<< HEAD
 use cairo_verifier::air::layouts::starknet_with_keccak::contract::{
-=======
-use cairo_verifier::air::layouts::starknet::contract::{
->>>>>>> autogenerated_split
     ILayoutCompositionContractDispatcher, ILayoutCompositionContractDispatcherTrait,
     ILayoutOodsContractDispatcher, ILayoutOodsContractDispatcherTrait,
 };
diff --git a/src/air/layouts/starknet_with_keccak/autogenerated.cairo b/src/air/layouts/starknet_with_keccak/autogenerated.cairo
index 36fc886b..3d0dad81 100644
--- a/src/air/layouts/starknet_with_keccak/autogenerated.cairo
+++ b/src/air/layouts/starknet_with_keccak/autogenerated.cairo
@@ -15135,11 +15135,7 @@ fn eval_oods_polynomial_inner(
 }
 
 #[cfg(feature: 'split')]
-<<<<<<< HEAD
 fn eval_composition_polynomial_inner_part_1(
-=======
-fn eval_composition_polynomial_inner_part1(
->>>>>>> autogenerated_split
     mut mask_values: Span<felt252>,
     mut constraint_coefficients: Span<felt252>,
     point: felt252,
@@ -21615,11 +21611,7 @@ fn eval_composition_polynomial_inner_part1(
 }
 
 #[cfg(feature: 'split')]
-<<<<<<< HEAD
 fn eval_composition_polynomial_inner_part_2(
-=======
-fn eval_composition_polynomial_inner_part2(
->>>>>>> autogenerated_split
     mut mask_values: Span<felt252>,
     mut constraint_coefficients: Span<felt252>,
     point: felt252,
@@ -28038,11 +28030,7 @@ fn eval_composition_polynomial_inner_part2(
 }
 
 #[cfg(feature: 'split')]
-<<<<<<< HEAD
 fn eval_composition_polynomial_inner_part_3(
-=======
-fn eval_composition_polynomial_inner_part3(
->>>>>>> autogenerated_split
     mut mask_values: Span<felt252>,
     mut constraint_coefficients: Span<felt252>,
     point: felt252,
@@ -36606,11 +36594,7 @@ fn eval_composition_polynomial_inner_part3(
 }
 
 #[cfg(feature: 'split')]
-<<<<<<< HEAD
 fn eval_composition_polynomial_inner_part_4(
-=======
-fn eval_composition_polynomial_inner_part4(
->>>>>>> autogenerated_split
     mut mask_values: Span<felt252>,
     mut constraint_coefficients: Span<felt252>,
     point: felt252,
@@ -43641,11 +43625,7 @@ fn eval_composition_polynomial_inner_part4(
 }
 
 #[cfg(feature: 'split')]
-<<<<<<< HEAD
 fn eval_composition_polynomial_inner_part_5(
-=======
-fn eval_composition_polynomial_inner_part5(
->>>>>>> autogenerated_split
     mut mask_values: Span<felt252>,
     mut constraint_coefficients: Span<felt252>,
     point: felt252,
@@ -50318,11 +50298,7 @@ fn eval_composition_polynomial_inner_part5(
 }
 
 #[cfg(feature: 'split')]
-<<<<<<< HEAD
 fn eval_composition_polynomial_inner_part_6(
-=======
-fn eval_composition_polynomial_inner_part6(
->>>>>>> autogenerated_split
     mut mask_values: Span<felt252>,
     mut constraint_coefficients: Span<felt252>,
     point: felt252,
@@ -56758,11 +56734,7 @@ fn eval_composition_polynomial_inner_part6(
 }
 
 #[cfg(feature: 'split')]
-<<<<<<< HEAD
 fn eval_composition_polynomial_inner_part_7(
-=======
-fn eval_composition_polynomial_inner_part7(
->>>>>>> autogenerated_split
     mut mask_values: Span<felt252>,
     mut constraint_coefficients: Span<felt252>,
     point: felt252,
@@ -62116,11 +62088,7 @@ fn eval_composition_polynomial_inner_part7(
 }
 
 #[cfg(feature: 'split')]
-<<<<<<< HEAD
 fn eval_oods_polynomial_inner_part_1(
-=======
-fn eval_oods_polynomial_inner_part1(
->>>>>>> autogenerated_split
     mut column_values: Span<felt252>,
     mut oods_values: Span<felt252>,
     mut constraint_coefficients: Span<felt252>,
@@ -63159,11 +63127,7 @@ fn eval_oods_polynomial_inner_part1(
 }
 
 #[cfg(feature: 'split')]
-<<<<<<< HEAD
 fn eval_oods_polynomial_inner_part_2(
-=======
-fn eval_oods_polynomial_inner_part2(
->>>>>>> autogenerated_split
     mut column_values: Span<felt252>,
     mut oods_values: Span<felt252>,
     mut constraint_coefficients: Span<felt252>,
diff --git a/src/air/layouts/starknet_with_keccak/contract.cairo b/src/air/layouts/starknet_with_keccak/contract.cairo
index fc5212dc..6a0d3e42 100644
--- a/src/air/layouts/starknet_with_keccak/contract.cairo
+++ b/src/air/layouts/starknet_with_keccak/contract.cairo
@@ -27,20 +27,15 @@ trait ILayoutOodsContract<ContractState> {
 
 #[starknet::contract]
 mod LayoutCompositionContract {
-<<<<<<< HEAD
     use super::{
         ILayoutCompositionContract, ILayoutCompositionContractDispatcher,
         ILayoutCompositionContractDispatcherTrait
     };
-=======
-    use super::ILayoutCompositionContract;
->>>>>>> autogenerated_split
     use cairo_verifier::air::layouts::starknet_with_keccak::{global_values::GlobalValues,};
     use starknet::ContractAddress;
 
     #[storage]
     struct Storage {
-<<<<<<< HEAD
         continuation_contract1: ContractAddress,
         continuation_contract2: ContractAddress,
         continuation_contract3: ContractAddress,
@@ -48,9 +43,6 @@ mod LayoutCompositionContract {
         continuation_contract5: ContractAddress,
         continuation_contract6: ContractAddress,
         continuation_contract7: ContractAddress,
-=======
-        continuation_contracts: Array<ContractAddress>,
->>>>>>> autogenerated_split
     }
 
     #[abi(embed_v0)]
@@ -64,11 +56,7 @@ mod LayoutCompositionContract {
             global_values: GlobalValues
         ) -> felt252 {
             let mut total_sum = ILayoutCompositionContractDispatcher {
-<<<<<<< HEAD
                 contract_address: self.continuation_contract1.read()
-=======
-                contract_address: continuation_contracts[0]
->>>>>>> autogenerated_split
             }
                 .eval_composition_polynomial_inner(
                     mask_values,
@@ -79,13 +67,9 @@ mod LayoutCompositionContract {
                 );
 
             total_sum +=
-<<<<<<< HEAD
                 ILayoutCompositionContractDispatcher {
                     contract_address: self.continuation_contract2.read()
                 }
-=======
-                ILayoutCompositionContractDispatcher { contract_address: continuation_contracts[1] }
->>>>>>> autogenerated_split
                 .eval_composition_polynomial_inner(
                     mask_values,
                     constraint_coefficients.slice(95, 100),
@@ -95,13 +79,9 @@ mod LayoutCompositionContract {
                 );
 
             total_sum +=
-<<<<<<< HEAD
                 ILayoutCompositionContractDispatcher {
                     contract_address: self.continuation_contract3.read()
                 }
-=======
-                ILayoutCompositionContractDispatcher { contract_address: continuation_contracts[2] }
->>>>>>> autogenerated_split
                 .eval_composition_polynomial_inner(
                     mask_values,
                     constraint_coefficients.slice(195, 34),
@@ -111,13 +91,9 @@ mod LayoutCompositionContract {
                 );
 
             total_sum +=
-<<<<<<< HEAD
                 ILayoutCompositionContractDispatcher {
                     contract_address: self.continuation_contract4.read()
                 }
-=======
-                ILayoutCompositionContractDispatcher { contract_address: continuation_contracts[3] }
->>>>>>> autogenerated_split
                 .eval_composition_polynomial_inner(
                     mask_values,
                     constraint_coefficients.slice(229, 31),
@@ -127,13 +103,9 @@ mod LayoutCompositionContract {
                 );
 
             total_sum +=
-<<<<<<< HEAD
                 ILayoutCompositionContractDispatcher {
                     contract_address: self.continuation_contract5.read()
                 }
-=======
-                ILayoutCompositionContractDispatcher { contract_address: continuation_contracts[4] }
->>>>>>> autogenerated_split
                 .eval_composition_polynomial_inner(
                     mask_values,
                     constraint_coefficients.slice(260, 25),
@@ -143,13 +115,9 @@ mod LayoutCompositionContract {
                 );
 
             total_sum +=
-<<<<<<< HEAD
                 ILayoutCompositionContractDispatcher {
                     contract_address: self.continuation_contract6.read()
                 }
-=======
-                ILayoutCompositionContractDispatcher { contract_address: continuation_contracts[5] }
->>>>>>> autogenerated_split
                 .eval_composition_polynomial_inner(
                     mask_values,
                     constraint_coefficients.slice(285, 25),
@@ -159,13 +127,9 @@ mod LayoutCompositionContract {
                 );
 
             total_sum +=
-<<<<<<< HEAD
                 ILayoutCompositionContractDispatcher {
                     contract_address: self.continuation_contract7.read()
                 }
-=======
-                ILayoutCompositionContractDispatcher { contract_address: continuation_contracts[6] }
->>>>>>> autogenerated_split
                 .eval_composition_polynomial_inner(
                     mask_values,
                     constraint_coefficients.slice(310, 37),
@@ -184,10 +148,7 @@ mod LayoutCompositionContract1 {
     use cairo_verifier::air::layouts::starknet_with_keccak::{
         global_values::GlobalValues, autogenerated::eval_composition_polynomial_inner_part_1,
     };
-<<<<<<< HEAD
     use starknet::ContractAddress;
-=======
->>>>>>> autogenerated_split
 
     #[storage]
     struct Storage {}
@@ -215,10 +176,7 @@ mod LayoutCompositionContract2 {
     use cairo_verifier::air::layouts::starknet_with_keccak::{
         global_values::GlobalValues, autogenerated::eval_composition_polynomial_inner_part_2,
     };
-<<<<<<< HEAD
     use starknet::ContractAddress;
-=======
->>>>>>> autogenerated_split
 
     #[storage]
     struct Storage {}
@@ -246,10 +204,7 @@ mod LayoutCompositionContract3 {
     use cairo_verifier::air::layouts::starknet_with_keccak::{
         global_values::GlobalValues, autogenerated::eval_composition_polynomial_inner_part_3,
     };
-<<<<<<< HEAD
     use starknet::ContractAddress;
-=======
->>>>>>> autogenerated_split
 
     #[storage]
     struct Storage {}
@@ -277,10 +232,7 @@ mod LayoutCompositionContract4 {
     use cairo_verifier::air::layouts::starknet_with_keccak::{
         global_values::GlobalValues, autogenerated::eval_composition_polynomial_inner_part_4,
     };
-<<<<<<< HEAD
     use starknet::ContractAddress;
-=======
->>>>>>> autogenerated_split
 
     #[storage]
     struct Storage {}
@@ -308,10 +260,7 @@ mod LayoutCompositionContract5 {
     use cairo_verifier::air::layouts::starknet_with_keccak::{
         global_values::GlobalValues, autogenerated::eval_composition_polynomial_inner_part_5,
     };
-<<<<<<< HEAD
     use starknet::ContractAddress;
-=======
->>>>>>> autogenerated_split
 
     #[storage]
     struct Storage {}
@@ -339,10 +288,7 @@ mod LayoutCompositionContract6 {
     use cairo_verifier::air::layouts::starknet_with_keccak::{
         global_values::GlobalValues, autogenerated::eval_composition_polynomial_inner_part_6,
     };
-<<<<<<< HEAD
     use starknet::ContractAddress;
-=======
->>>>>>> autogenerated_split
 
     #[storage]
     struct Storage {}
@@ -370,10 +316,7 @@ mod LayoutCompositionContract7 {
     use cairo_verifier::air::layouts::starknet_with_keccak::{
         global_values::GlobalValues, autogenerated::eval_composition_polynomial_inner_part_7,
     };
-<<<<<<< HEAD
     use starknet::ContractAddress;
-=======
->>>>>>> autogenerated_split
 
     #[storage]
     struct Storage {}
@@ -396,7 +339,6 @@ mod LayoutCompositionContract7 {
 }
 
 #[starknet::contract]
-<<<<<<< HEAD
 mod LayoutOodsContract {
     use super::{
         ILayoutOodsContract, ILayoutOodsContractDispatcher, ILayoutOodsContractDispatcherTrait
@@ -408,15 +350,6 @@ mod LayoutOodsContract {
     struct Storage {
         continuation_contract1: ContractAddress,
         continuation_contract2: ContractAddress,
-=======
-mod LayoutOodsContract1 {
-    use super::ILayoutOodsContract;
-    use cairo_verifier::air::layouts::starknet_with_keccak::{global_values::GlobalValues,};
-
-    #[storage]
-    struct Storage {
-        continuation_contracts: Array<ContractAddress>,
->>>>>>> autogenerated_split
     }
 
     #[abi(embed_v0)]
@@ -431,11 +364,7 @@ mod LayoutOodsContract1 {
             trace_generator: felt252,
         ) -> felt252 {
             let mut total_sum = ILayoutOodsContractDispatcher {
-<<<<<<< HEAD
                 contract_address: self.continuation_contract1.read()
-=======
-                contract_address: continuation_contracts[0]
->>>>>>> autogenerated_split
             }
                 .eval_oods_polynomial_inner(
                     column_values,
@@ -447,13 +376,9 @@ mod LayoutOodsContract1 {
                 );
 
             total_sum +=
-<<<<<<< HEAD
                 ILayoutOodsContractDispatcher {
                     contract_address: self.continuation_contract2.read()
                 }
-=======
-                ILayoutOodsContractDispatcher { contract_address: continuation_contracts[1] }
->>>>>>> autogenerated_split
                 .eval_oods_polynomial_inner(
                     column_values,
                     oods_values.slice(349, oods_values.len() - 349),