testing conflict resolution