tests for conflict handling