test for conflict
test conflict