DEL: manually resolved conflict

Should be ok now to start afresh with kobe example