fixed broken merge commit

dsa/emulator/src/backend/processor/processor.rs

@@ -2,29 +2,21 @@ use std::{
     hint::unlikely,
     ops::AddAssign,
     sync::{
+        Arc,
         atomic::Ordering,
         mpsc::{self, TryRecvError},
-        Arc,
     },
     thread,
     time::{Duration, Instant},
 };
 
-use common::isa::instructions::{Instruction, Opcode};
-use common::isa::register::Register;
 use crate::{
-<<<<<<< HEAD:dsa/emulator/src/processor/processor.rs
-    config::{IoMapping, MemoryMap, RegionType},
-    io::{IoDevice, MappedDevice},
-    memory::{mmu::MMU, ram::RandomAccessMemory},
-    processor::{interrupts::Interrupt, state::SharedState},
-    Page,
-=======
     MemoryBank, Page, SharedState,
     backend::{memory::mmu::MMU, processor::interrupts::Interrupt},
-    config::{IoMapping, MemoryMap, RegionType},
->>>>>>> refs/remotes/origin/main:dsa/emulator/src/backend/processor/processor.rs
+    config::{MemoryMap, RegionType},
 };
+use common::isa::instructions::{Instruction, Opcode};
+use common::isa::register::Register;
 
 pub struct Emulator {
     internal_state: ProcessorSnapshot,