Fix conflicts...

Author: ryoqun

runtime/src/accounts_db.rs

@@ -451,12 +451,8 @@ impl Default for AccountsDB {
                 .build()
                 .unwrap(),
             min_num_stores: num_threads,
-<<<<<<< HEAD
             bank_hashes: RwLock::new(HashMap::default()),
-=======
-            bank_hashes: RwLock::new(bank_hashes),
             dont_cleanup_dead_slots: AtomicBool::new(false),
->>>>>>> 5d9130a3c... Hack to skip cleanup_dead_slots upon snapshot load
         }
     }
 }
@@ -1172,17 +1168,11 @@ impl AccountsDB {
         dead_slots
     }
 
-<<<<<<< HEAD
-    fn cleanup_dead_slots(&self, dead_slots: &mut HashSet<Slot>, last_root: u64) {
-        // a slot is not totally dead until it is older than the root
-        dead_slots.retain(|slot| *slot < last_root);
-=======
     fn cleanup_dead_slots(&self, dead_slots: &mut HashSet<Slot>) {
         if self.dont_cleanup_dead_slots.load(Ordering::Relaxed) {
             return;
         }
 
->>>>>>> 5d9130a3c... Hack to skip cleanup_dead_slots upon snapshot load
         if !dead_slots.is_empty() {
             {
                 let mut index = self.accounts_index.write().unwrap();