Added conflict handling