Fixing bad merge on secret_token.