Remove conflict in ignore