kexec - fix merge derp