Speaking of which — I have now disabled rebase merges for the osquery repo. Squash for ever