diff --git a/src/arch/x86_64/device/ioapic.rs b/src/arch/x86_64/device/ioapic.rs
index ecee0e8b7f993b0076567a817a1a17252a4a8188..8c5c930e42ab1aac252ac1adaa7d9353ec0ee2a3 100644
--- a/src/arch/x86_64/device/ioapic.rs
+++ b/src/arch/x86_64/device/ioapic.rs
@@ -306,12 +306,15 @@ pub unsafe fn init(active_table: &mut ActivePageTable) {
                 _ => (),
             }
         }
+<<<<<<< HEAD
 /*
         let namespace_guard = crate::acpi::ACPI_TABLE.namespace.read();
         for (k, v) in namespace_guard.as_ref().unwrap().iter() {
             println!("{} = {:?}", k, v);
         }
 */
+=======
+>>>>>>> c723256... Use the I/O APIC when applicable.
     }
     println!("I/O APICs: {:?}, overrides: {:?}", ioapics(), src_overrides());