merged conflicts in ignore file