Commits

Thiago Rodrigues authored 3b9d4011e68 Merge
feat: resolve conflicts

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut