Ensure we have keys to activate these features (#21669)

(cherry picked from commit 45e56c5)

# Conflicts:
#	sdk/src/feature_set.rs

sdk/src/feature_set.rs

@@ -201,6 +201,7 @@ pub mod demote_program_write_locks {
     solana_sdk::declare_id!("3E3jV7v9VcdJL8iYZUMax9DiDno8j7EWUVbhm9RtShj2");
 }
 
+<<<<<<< HEAD
 pub mod allow_native_ids {
     solana_sdk::declare_id!("GVnDbNkECwrzLM7aVBGWpBYo3yH1ACaXB4ottNX8pedZ");
 }
@@ -211,12 +212,27 @@ pub mod check_seed_length {
 
 pub mod fix_write_privs {
     solana_sdk::declare_id!("7Tr5C1tdcCeBVD8jxtHYnvjL1DGdFboYBHCJkEFdenBb");
+=======
+pub mod ed25519_program_enabled {
+    solana_sdk::declare_id!("6ppMXNYLhVd7GcsZ5uV11wQEW7spppiMVfqQv5SXhDpX");
+}
+
+pub mod return_data_syscall_enabled {
+    solana_sdk::declare_id!("DwScAzPUjuv65TMbDnFY7AgwmotzWy3xpEJMXM3hZFaB");
+>>>>>>> 45e56c599 (Ensure we have keys to activate these features (#21669))
 }
 
 pub mod reduce_required_deploy_balance {
     solana_sdk::declare_id!("EBeznQDjcPG8491sFsKZYBi5S5jTVXMpAKNDJMQPS2kq");
 }
 
+<<<<<<< HEAD
+=======
+pub mod sol_log_data_syscall_enabled {
+    solana_sdk::declare_id!("6uaHcKPGUy4J7emLBgUTeufhJdiwhngW6a1R9B7c2ob9");
+}
+
+>>>>>>> 45e56c599 (Ensure we have keys to activate these features (#21669))
 pub mod stakes_remove_delegation_if_inactive {
     solana_sdk::declare_id!("HFpdDDNQjvcXnXKec697HDDsyk6tFoWS2o8fkxuhQZpL");
 }