Regenerate JWT API
Resolve conflict