Yes, the -ko seems to work in my test, but I don't know how it will help you in merging in the delta you already have. You will only get the -ko by doing an update (I think) and that is what is failing. I'll read through the hacker-guide tonight.