String (@NotNull Change change) { FilePath bPath = ChangesUtil.getBeforePath(change); FilePath aPath = ChangesUtil.getAfterPath(change); String bListId = myListsForPathsBeforeUpdate.get(bPath); String aListId = myListsForPathsBeforeUpdate.get(aPath); if (CONFLICT_CHANGELIST_ID.equals(bListId) || CONFLICT_CHANGELIST_ID.equals(aListId)) return null; if (bListId == null && aListId == null) return null; if (bListId == null) return aListId; if (aListId == null) return bListId; return bListId.equals(aListId) ? bListId : null; }