SK1127 V25 Conflict and conflict resolution