Added test for conflict handling code.