conflict resolution support