diff --git a/kern/pmap.c b/kern/pmap.c
index 75f7a81..9f49367 100644
--- a/kern/pmap.c
+++ b/kern/pmap.c
@@ -213,11 +213,6 @@ mem_init(void)
 	boot_map_region(kern_pgdir,
 			KSTACKTOP-KSTKSIZE, KSTKSIZE,
 			PADDR(bootstack), PTE_W);
-<<<<<<< HEAD
-	kern_pgdir[PDX(KSTACKTOP-KSTKSIZE)] |= PTE_W;
-	kern_pgdir[PDX(KSTACKTOP-KSTKSIZE)] &= ~PTE_U;
-=======
->>>>>>> lab2
 
 	//////////////////////////////////////////////////////////////////////
 	// Map all of physical memory at KERNBASE.