Fix Kernel merge