New ignore file
Conflict resolving