adding ignore file.
Update .gitignore
Solved conflicts