test for conflict resolution