Fix conventions
- Fix git bug -