conflict resolution test