added ConflictSummary function