delivery rather than queueing it and forgetting it. (and some -Wall fixes where gcc is too dumb to see it's a "cant happen")
The conflict merge will happen shortly after.