Vish/Naz - Resolved Merge Conflict in git ignore