gitignore
Conflict Resolution.