Looks like a rebase is missing?
(stopping review now; lemme know when to look again)