conflict_resolved