Alternative conflict resolution strategy
