Revert "Update builtins.rs"

This reverts commit a54fa45d5a.

ledger/src/builtins.rs

@@ -1,8 +1,15 @@
+<<<<<<< HEAD
 use solana_runtime::{
     bank::{Builtin, Builtins},
     builtins::ActivationType,
 };
 use solana_sdk::{feature_set, pubkey::Pubkey};
+=======
+use {
+    solana_runtime::builtins::{ActivationType, Builtin, Builtins},
+    solana_sdk::pubkey::Pubkey,
+};
+>>>>>>> e31b469f5 (Quash M1 build warning)
 
 macro_rules! to_builtin {
     ($b:expr) => {