Authorize args fix conflicts

This should bring your pull request up to date with the current state of elabs/pundit master if interested. Thanks.