Initial code with gitignore
Resolve gitignore conflict