Initialize repo with .gitignore
Fixing merge conflict