Expanded conflict resolution