diff --git a/kernel/src/arch/x86_64/mod.rs b/kernel/src/arch/x86_64/mod.rs
index 7bd6bd6..341df6d 100644
--- a/kernel/src/arch/x86_64/mod.rs
+++ b/kernel/src/arch/x86_64/mod.rs
@@ -1,5 +1,4 @@
-<<<<<<< Updated upstream
-=======
+
 pub mod gdt;
->>>>>>> Stashed changes
+
 pub mod interrupts;