Initial commit without validations
Gitignore conflicts fix