you're right, rebasing this branch totally exploded and that fell out of the merge