# Conflicts:
#   Makefile
#   README.md
#   kernel/include/defs.h
#   kernel/include/proc.h
#   kernel/include/syscall.h
#   kernel/syscall.c
#   user/user.h
#   user/usys.pl