Remove branch switch-back and update lint check

Remove the need for multiple ci overrides.

Also fixes the CI linting so that it actually tests the branch it's supposed to be testing.