Master back to init
Add version number
Version bump
The hotfix
Conflict resolved