Fixing merge issue

userprog/syscall.c

@@ -58,6 +58,9 @@ syscall_handler (struct intr_frame *f UNUSED)
   case SYSCALL_HALT:
     syscall_halt(f);
     break;
+  case SYSCALL_EXIT:
+	  syscall_exit(f);
+	  break;
   case SYSCALL_EXEC:
     syscall_exec(f);
     break;