diff --git a/src/userprog/process.c b/src/userprog/process.c
index d9dcdf652264cb21f56fe36d8cb13040108c6e48..fb66c0ba734d9019aadb2991c256b7f8fb2a09f0 100644
--- a/src/userprog/process.c
+++ b/src/userprog/process.c
@@ -445,7 +445,11 @@ setup_stack (void **esp)
     {
       success = install_page (((uint8_t *) PHYS_BASE) - PGSIZE, kpage, true);
       if (success) {
+<<<<<<< HEAD
         *esp = PHYS_BASE-12;
+=======
+        *esp = PHYS_BASE -12;
+>>>>>>> d77e0c536f9a037e69a61981ba72cef02b81de68
       } else
         palloc_free_page (kpage);
     }