On rereading, I notice that the conflict message does not mention kernel-desktop, which is my default kernel (and the currently running one).