resolve conflict

sdk/src/feature_set.rs

@@ -724,17 +724,10 @@ pub mod validate_fee_collector_account {
     solana_sdk::declare_id!("prpFrMtgNmzaNzkPJg9o753fVvbHKqNrNTm76foJ2wm");
 }
 
-<<<<<<< HEAD
-=======
-pub mod disable_rent_fees_collection {
-    solana_sdk::declare_id!("CJzY83ggJHqPGDq8VisV3U91jDJLuEaALZooBrXtnnLU");
-}
-
 pub mod enable_zk_transfer_with_fee {
     solana_sdk::declare_id!("zkNLP7EQALfC1TYeB3biDU7akDckj8iPkvh9y2Mt2K3");
 }
 
->>>>>>> a8863bd9fe ([zk-token-proof] Feature gate transfer with fee related proofs (#34103))
 lazy_static! {
     /// Map of feature identifiers to user-visible description
     pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@@ -911,11 +904,7 @@ lazy_static! {
         (update_hashes_per_tick5::id(), "Update desired hashes per tick to 9.2M"),
         (update_hashes_per_tick6::id(), "Update desired hashes per tick to 10M"),
         (validate_fee_collector_account::id(), "validate fee collector account #33888"),
-<<<<<<< HEAD
-=======
-        (disable_rent_fees_collection::id(), "Disable rent fees collection #33945"),
         (enable_zk_transfer_with_fee::id(), "enable Zk Token proof program transfer with fee"),
->>>>>>> a8863bd9fe ([zk-token-proof] Feature gate transfer with fee related proofs (#34103))
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()