void (Collection<? extends Change> changes) { if (!shouldDetectConflicts() && !myOptions.HIGHLIGHT_NON_ACTIVE_CHANGELIST) return; for (Change change : changes) { ContentRevision revision = change.getAfterRevision(); if (revision == null) continue; FilePath filePath = revision.getFile(); String path = filePath.getPath(); Conflict conflict = myConflicts.remove(path); boolean conflictRemoved = conflict != null && !conflict.ignored; if (conflictRemoved || myOptions.HIGHLIGHT_NON_ACTIVE_CHANGELIST) { VirtualFile file = filePath.getVirtualFile(); if (file != null) { FileStatusManager.getInstance(myProject).fileStatusChanged(file); if (conflictRemoved) { EditorNotifications.getInstance(myProject).updateNotifications(file); } } } } }