- Update hbs setup
- Merge