Testing conflict handling