Removing merge errors from kern/init.c
LAB:1:e2: EPT TEST PASSES