changed conflicts notification type