Init version
Merge conflict fix