test conflict resolution