“Focuses on an admission of error and conflict resolution rather than the initial provocative act.”