Global ignores and better spec function
Conflict resolution