Did I not rebase from master? I thought the linter checks for these things.