Init
Fix conflict .gitignore file