Resolve merge conflict and fix standalone kernel build.