Init Project
Fix .gitignore conflict