Add .gitignore
Resolve Conflict in .gitignore